Remove macro_use and extern crate uses that are unnecessary (stellar#151

)
brson · Oct 13, 2022 · 88cb7b0 · 88cb7b0
1 parent 1562993
commit 88cb7b0
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 20 deletions.
diff --git a/liquidity_pool_router/src/lib.rs b/liquidity_pool_router/src/lib.rs
@@ -1,8 +1,5 @@
 #![no_std]
 
-#[cfg(any(test, feature = "testutils"))]
-extern crate std;
-
 mod pool_contract;
 mod test;
 pub mod testutils;

diff --git a/liquidity_pool_router/src/pool_contract.rs b/liquidity_pool_router/src/pool_contract.rs
@@ -12,6 +12,9 @@ pub fn create_contract(e: &Env, salt: &BytesN<32>) -> BytesN<32> {
     e.deployer().with_current_contract(salt).deploy(bin)
 }
 
+#[cfg(all(any(test, feature = "testutils"), not(feature = "token-wasm")))]
+extern crate std;
+
 #[cfg(all(any(test, feature = "testutils"), not(feature = "token-wasm")))]
 pub fn create_contract(e: &Env, salt: &BytesN<32>) -> BytesN<32> {
     use sha2::{Digest, Sha256};

diff --git a/single_offer/src/lib.rs b/single_offer/src/lib.rs
@@ -1,8 +1,5 @@
 #![no_std]
 
-#[cfg(feature = "testutils")]
-extern crate std;
-
 mod test;
 pub mod testutils;
 

diff --git a/single_offer_router/src/lib.rs b/single_offer_router/src/lib.rs
@@ -1,8 +1,5 @@
 #![no_std]
 
-#[cfg(any(test, feature = "testutils"))]
-extern crate std;
-
 mod offer_contract;
 mod test;
 pub mod testutils;

diff --git a/single_offer_router/src/offer_contract.rs b/single_offer_router/src/offer_contract.rs
@@ -12,6 +12,9 @@ pub fn create_contract(e: &Env, salt: &BytesN<32>) -> BytesN<32> {
     e.deployer().with_current_contract(salt).deploy(bin)
 }
 
+#[cfg(all(any(test, feature = "testutils"), not(feature = "token-wasm")))]
+extern crate std;
+
 #[cfg(all(any(test, feature = "testutils"), not(feature = "token-wasm")))]
 pub fn create_contract(e: &Env, salt: &BytesN<32>) -> BytesN<32> {
     use sha2::{Digest, Sha256};

diff --git a/single_offer_xfer_from/src/lib.rs b/single_offer_xfer_from/src/lib.rs
@@ -1,8 +1,5 @@
 #![no_std]
 
-#[cfg(feature = "testutils")]
-extern crate std;
-
 mod test;
 pub mod testutils;
 

diff --git a/timelock/src/lib.rs b/timelock/src/lib.rs
@@ -5,8 +5,6 @@
 //! account(s) claim it before or after provided time point.
 //! For simplicity, the contract only supports invoker-based auth.
 #![no_std]
-#[cfg(feature = "testutils")]
-extern crate std;
 
 use soroban_sdk::{contractimpl, contracttype, BigInt, BytesN, Env, Vec};
 

diff --git a/token/src/lib.rs b/token/src/lib.rs
@@ -1,9 +1,5 @@
 #![no_std]
 
-#[cfg(any(test, feature = "testutils"))]
-#[macro_use]
-extern crate std;
-
 mod admin;
 mod allowance;
 mod balance;

diff --git a/wallet/src/lib.rs b/wallet/src/lib.rs
@@ -2,8 +2,6 @@
 //! complex auth scheme with multiple signers that authorize payments in immediate
 //! or delayed (async) fashion.
 #![no_std]
-#[cfg(feature = "testutils")]
-extern crate std;
 
 use soroban_auth::{verify, Identifier, Signature};
 use soroban_sdk::{