diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 14ed33fd..4dff25a7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.92.0 + toolchain: 1.95.0 - if: matrix.os == 'windows-latest' name: Windows Dependencies shell: pwsh @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@v2 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.92.0 + toolchain: 1.95.0 - name: Integration_Test run: make integration @@ -57,7 +57,7 @@ jobs: - uses: actions/checkout@v2 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.92.0 + toolchain: 1.95.0 - name: Linters run: | cargo fmt --version || rustup component add rustfmt @@ -78,7 +78,7 @@ jobs: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.92.0 + toolchain: 1.95.0 - name: cargo-deny uses: EmbarkStudios/cargo-deny-action@v2 with: diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 7f229af9..00000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.92.0 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 00000000..f25b5b14 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.95.0" diff --git a/src/subcommands/tx.rs b/src/subcommands/tx.rs index c8b005af..f6745836 100644 --- a/src/subcommands/tx.rs +++ b/src/subcommands/tx.rs @@ -460,7 +460,7 @@ impl CliSubCommand for TxSubCommand<'_> { } let mut output_total = 0; - for (output, data) in tx.outputs().into_iter().zip(tx.outputs_data().into_iter()) { + for (output, data) in tx.outputs().into_iter().zip(tx.outputs_data()) { let capacity: u64 = output.capacity().unpack(); output_total += capacity; let data_len = data.raw_data().len(); diff --git a/src/subcommands/util.rs b/src/subcommands/util.rs index 5276ae18..1203ddae 100644 --- a/src/subcommands/util.rs +++ b/src/subcommands/util.rs @@ -863,11 +863,7 @@ fn search_path( let key_set = plugin_mgr .keystore_handler() .derived_key_set_by_index(hash160, 0, 2000, 0, 2000, password)?; - for (path, hash) in key_set - .external - .into_iter() - .chain(key_set.change.into_iter()) - { + for (path, hash) in key_set.external.into_iter().chain(key_set.change) { if hash == target { return Ok(path); } diff --git a/src/subcommands/wallet.rs b/src/subcommands/wallet.rs index 026db305..58381bf4 100644 --- a/src/subcommands/wallet.rs +++ b/src/subcommands/wallet.rs @@ -287,11 +287,7 @@ impl<'a> WalletSubCommand<'a> { None, )?; let mut change_path_opt = None; - for (path, hash160) in key_set - .external - .into_iter() - .chain(key_set.change.into_iter()) - { + for (path, hash160) in key_set.external.into_iter().chain(key_set.change) { if hash160 == change_last { change_path_opt = Some(path.clone()); }