diff --git a/coins/monero/ringct/bulletproofs/src/batch_verifier.rs b/coins/monero/ringct/bulletproofs/src/batch_verifier.rs index 3821411b..2bb4c03b 100644 --- a/coins/monero/ringct/bulletproofs/src/batch_verifier.rs +++ b/coins/monero/ringct/bulletproofs/src/batch_verifier.rs @@ -1,3 +1,5 @@ +use std_shims::{vec, vec::Vec}; + use curve25519_dalek::{ constants::ED25519_BASEPOINT_POINT, traits::{IsIdentity, VartimeMultiscalarMul}, diff --git a/coins/monero/ringct/bulletproofs/src/core.rs b/coins/monero/ringct/bulletproofs/src/core.rs index 4246a4bc..35720aae 100644 --- a/coins/monero/ringct/bulletproofs/src/core.rs +++ b/coins/monero/ringct/bulletproofs/src/core.rs @@ -1,4 +1,4 @@ -use std_shims::{vec::Vec, sync::OnceLock}; +use std_shims::{vec, vec::Vec, sync::OnceLock}; use rand_core::{RngCore, CryptoRng}; use subtle::{Choice, ConditionallySelectable}; diff --git a/coins/monero/ringct/bulletproofs/src/lib.rs b/coins/monero/ringct/bulletproofs/src/lib.rs index 1ab041b3..c9645693 100644 --- a/coins/monero/ringct/bulletproofs/src/lib.rs +++ b/coins/monero/ringct/bulletproofs/src/lib.rs @@ -4,7 +4,7 @@ #![allow(non_snake_case)] use std_shims::{ - vec::Vec, + vec, vec::Vec, io::{self, Read, Write}, }; diff --git a/coins/monero/ringct/bulletproofs/src/original.rs b/coins/monero/ringct/bulletproofs/src/original.rs index 4958f1e4..c4f9e38a 100644 --- a/coins/monero/ringct/bulletproofs/src/original.rs +++ b/coins/monero/ringct/bulletproofs/src/original.rs @@ -1,4 +1,4 @@ -use std_shims::{vec::Vec, sync::OnceLock}; +use std_shims::{vec, vec::Vec, sync::OnceLock}; use rand_core::{RngCore, CryptoRng}; use zeroize::Zeroize; diff --git a/coins/monero/ringct/bulletproofs/src/plus/aggregate_range_proof.rs b/coins/monero/ringct/bulletproofs/src/plus/aggregate_range_proof.rs index 3dd21879..f36b819c 100644 --- a/coins/monero/ringct/bulletproofs/src/plus/aggregate_range_proof.rs +++ b/coins/monero/ringct/bulletproofs/src/plus/aggregate_range_proof.rs @@ -1,4 +1,4 @@ -use std_shims::vec::Vec; +use std_shims::{vec, vec::Vec}; use rand_core::{RngCore, CryptoRng}; use zeroize::{Zeroize, ZeroizeOnDrop, Zeroizing}; diff --git a/coins/monero/ringct/bulletproofs/src/plus/weighted_inner_product.rs b/coins/monero/ringct/bulletproofs/src/plus/weighted_inner_product.rs index e446a79b..42a7800b 100644 --- a/coins/monero/ringct/bulletproofs/src/plus/weighted_inner_product.rs +++ b/coins/monero/ringct/bulletproofs/src/plus/weighted_inner_product.rs @@ -1,4 +1,4 @@ -use std_shims::vec::Vec; +use std_shims::{vec, vec::Vec}; use rand_core::{RngCore, CryptoRng}; use zeroize::{Zeroize, ZeroizeOnDrop}; diff --git a/coins/monero/ringct/bulletproofs/src/scalar_vector.rs b/coins/monero/ringct/bulletproofs/src/scalar_vector.rs index a8354c4d..ae723a42 100644 --- a/coins/monero/ringct/bulletproofs/src/scalar_vector.rs +++ b/coins/monero/ringct/bulletproofs/src/scalar_vector.rs @@ -2,7 +2,7 @@ use core::{ borrow::Borrow, ops::{Index, IndexMut, Add, Sub, Mul}, }; -use std_shims::vec::Vec; +use std_shims::{vec, vec::Vec}; use zeroize::{Zeroize, ZeroizeOnDrop}; diff --git a/coins/monero/ringct/clsag/src/lib.rs b/coins/monero/ringct/clsag/src/lib.rs index e999f7c6..60950fb3 100644 --- a/coins/monero/ringct/clsag/src/lib.rs +++ b/coins/monero/ringct/clsag/src/lib.rs @@ -5,7 +5,7 @@ use core::ops::Deref; use std_shims::{ - vec::Vec, + vec, vec::Vec, io::{self, Read, Write}, }; diff --git a/coins/monero/src/wallet/send/mod.rs b/coins/monero/src/wallet/send/mod.rs index 4f0f7eae..ef2504b3 100644 --- a/coins/monero/src/wallet/send/mod.rs +++ b/coins/monero/src/wallet/send/mod.rs @@ -190,7 +190,7 @@ fn prepare_inputs( // We now need to sort the inputs by their key image // We take the transaction's inputs, temporarily let mut tx_inputs = Vec::with_capacity(inputs.len()); - std::mem::swap(&mut tx_inputs, &mut tx.prefix.inputs); + core::mem::swap(&mut tx_inputs, &mut tx.prefix.inputs); // Then we join them with their signable contexts let mut joint = tx_inputs.into_iter().zip(signable).collect::>();