Correct no-std builds for monero-clsag and monero-bulletproofs

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},

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};

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},
 };
 

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;

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};

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};

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};
 

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},
 };
 

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::<Vec<_>>();