Update to rust 1.40.0 (#7572)

* Update to rust 1.40.0 * fixups
2019-12-19 23:27:54 -08:00
parent 2ebfab8e07
commit a7040896f0
33 changed files with 198 additions and 139 deletions
--- a/cli/src/stake.rs
+++ b/cli/src/stake.rs
@@ -658,9 +658,10 @@ pub fn process_show_stake_account(
 ) -> ProcessResult {
    let stake_account = rpc_client.get_account(stake_account_pubkey)?;
    if stake_account.owner != solana_stake_program::id() {
-        return Err(CliError::RpcRequestError(
-            format!("{:?} is not a stake account", stake_account_pubkey).to_string(),
-        )
+        return Err(CliError::RpcRequestError(format!(
+            "{:?} is not a stake account",
+            stake_account_pubkey
+        ))
        .into());
    }
    fn show_authorized(authorized: &Authorized) {