Skip to content

Commit 8f25cb6

Browse files
committed
Merge branch 'origin/ray/rust-1.70' (#1416)
* origin/ray/rust-1.70: rustfmt: update config for new nightly-2023-06-01 clippy: fix warnings clippy: fix lint `clippy::derive_hash_xor_eq` deps: update `log` transitive dependency to avoid clippy errors all: bump rust to 1.70
2 parents 62ce550 + 8acf2b0 commit 8f25cb6

File tree

18 files changed

+102
-137
lines changed

18 files changed

+102
-137
lines changed

Cargo.lock

Lines changed: 41 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ark-std = "0.3.0"
6666
# branch = "bat/arse-merkle-tree"
6767
arse-merkle-tree = {package = "sparse-merkle-tree", git = "https://github.com/heliaxdev/sparse-merkle-tree", rev = "e086b235ed6e68929bf73f617dd61cd17b000a56", features = ["std", "borsh"]}
6868
assert_matches = "1.5.0"
69-
async-std = {version = "=1.11.0", features = ["unstable"]}
69+
async-std = {version = "=1.12.0", features = ["unstable"]}
7070
async-trait = "0.1.51"
7171
base64 = "0.13.0"
7272
bech32 = "0.8.0"

apps/src/lib/client/tx.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ pub async fn submit_vote_proposal<C: namada::ledger::queries::Client + Sync>(
642642
"yay" => {
643643
if let Some(pgf) = args.proposal_pgf {
644644
let splits = pgf.trim().split_ascii_whitespace();
645-
let address_iter = splits.clone().into_iter().step_by(2);
645+
let address_iter = splits.clone().step_by(2);
646646
let cap_iter = splits.into_iter().skip(1).step_by(2);
647647
let mut set = HashSet::new();
648648
for (address, cap) in

apps/src/lib/node/ledger/shell/process_proposal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,7 @@ mod test_process_proposal {
11731173
wrapper.clone().update_header(TxType::Raw).header_hash();
11741174

11751175
// Write inner hash to storage
1176-
let hash_key = replay_protection::get_tx_hash_key(&inner_unsigned_hash);
1176+
let hash_key = replay_protection::get_tx_hash_key(inner_unsigned_hash);
11771177
shell
11781178
.wl_storage
11791179
.storage

0 commit comments

Comments
 (0)