gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade to Rust 1.31.0 (#2052)

Browse Source 
* Upgrade to Rust 1.31.0
* Upgrade nightly
* Fix all clippy warnings
* Revert relaxed version check and update
This commit is contained in:
Greg Fitzgerald
2018-12-07 20:01:28 -07:00
committed by GitHub
parent 2bad6584f6
commit 0a83b17cdd
70 changed files with 487 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drone/src/bin/drone.rs
View File

@ -40,19 +40,22 @@ fn main() -> Result<(), Box<error::Error>> {
.takes_value(true)
.required(true)
.help("File from which to read the mint's keypair"),
).arg(
)
.arg(
Arg::with_name("slice")
.long("slice")
.value_name("SECS")
.takes_value(true)
.help("Time slice over which to limit requests to drone"),
).arg(
)
.arg(
Arg::with_name("cap")
.long("cap")
.value_name("NUM")
.takes_value(true)
.help("Request limit for time slice"),
).get_matches();
)
.get_matches();
let mint_keypair =
read_keypair(matches.value_of("keypair").unwrap()).expect("failed to read client keypair");
@ -139,7 +142,8 @@ fn main() -> Result<(), Box<error::Error>> {
io::ErrorKind::Other,
format!("Drone response: {:?}", err),
))
})).then(|_| Ok(()));
}))
.then(|_| Ok(()));
tokio::spawn(server)
});
tokio::run(done);

6
drone/src/drone.rs
View File

@ -131,7 +131,8 @@ impl Drone {
.add_field(
"request_current",
influxdb::Value::Integer(self.request_current as i64),
).to_owned(),
)
.to_owned(),
);
info!("Requesting airdrop of {} to {:?}", tokens, to);
@ -283,7 +284,8 @@ pub fn run_local_drone(mint_keypair: Keypair, sender: Sender<SocketAddr>) {
io::ErrorKind::Other,
format!("Drone response: {:?}", err),
))
})).then(|_| Ok(()));
}))
.then(|_| Ok(()));
tokio::spawn(server)
});
tokio::run(done);