Upgrade to Rust 1.31.0 (#2052)

* 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

View File

@ -254,7 +254,8 @@ mod test {
let index = index as usize;
let key = &tx.account_keys[index];
(key, index < tx.signatures.len())
}).zip(program_accounts.iter_mut())
})
.zip(program_accounts.iter_mut())
.map(|((key, is_signer), account)| KeyedAccount::new(key, is_signer, account))
.collect();

View File

@ -106,7 +106,7 @@ impl Default for TokenProgram {
}
impl TokenProgram {
#[cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
#[allow(clippy::needless_pass_by_value)]
fn map_to_invalid_args(err: std::boxed::Box<bincode::ErrorKind>) -> Error {
warn!("invalid argument: {:?}", err);
Error::InvalidArgument
@ -424,7 +424,8 @@ impl TokenProgram {
} else {
TokenProgram::Invalid
}
}).collect();
})
.collect();
for program_account in &input_program_accounts {
info!("input_program_account: userdata={:?}", program_account);

View File

@ -169,7 +169,8 @@ mod tests {
local tokens, _ = string.unpack("I", data)
accounts[1].tokens = accounts[1].tokens - tokens
accounts[2].tokens = accounts[2].tokens + tokens
"#.as_bytes()
"#
.as_bytes()
.to_vec();
let alice_pubkey = Pubkey::default();
@ -214,7 +215,8 @@ mod tests {
let userdata = r#"
local serialize = load(accounts[2].userdata)().serialize
accounts[3].userdata = serialize({a=1, b=2, c=3}, nil, "s")
"#.as_bytes()
"#
.as_bytes()
.to_vec();
let owner = Pubkey::default();
let program_account = Account {
@ -295,7 +297,8 @@ mod tests {
let data = format!(
r#"{{m=2, n={{"{}","{}","{}"}}, tokens=100}}"#,
carol_pubkey, dan_pubkey, erin_pubkey
).as_bytes()
)
.as_bytes()
.to_vec();
process(&owner, &mut keyed_accounts, &data, 0).unwrap();