Regroup mods and use canonical pub use style.

mfaulk · Mar 1, 2022 · c034900 · c034900
1 parent 06953de
commit c034900
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/attest/ake/src/lib.rs b/attest/ake/src/lib.rs
@@ -18,7 +18,7 @@ mod responder;
 mod shared;
 mod state;
 
-pub use self::{
+pub use crate::{
     error::Error,
     event::{
         AuthRequestOutput, AuthResponseInput, AuthResponseOutput, Ciphertext,

diff --git a/attest/net/src/lib.rs b/attest/net/src/lib.rs
@@ -8,7 +8,7 @@ extern crate core;
 
 mod traits;
 
-pub use self::traits::{Error, RaClient, Result};
+pub use crate::traits::{Error, RaClient, Result};
 
 // Export the "build-configured" RaClient so that downstream doesn't need
 // to copy paste this cfg_if every where and have a build.rs unnecessarily

diff --git a/connection/src/lib.rs b/connection/src/lib.rs
@@ -9,7 +9,7 @@ mod sync;
 mod thick;
 mod traits;
 
-pub use self::{
+pub use crate::{
     credentials::{
         AnyCredentialsError, AnyCredentialsProvider, AuthenticationError, CredentialsProvider,
         CredentialsProviderError, HardcodedCredentialsProvider, TokenBasicCredentialsProvider,

diff --git a/connection/test-utils/src/lib.rs b/connection/test-utils/src/lib.rs
@@ -13,4 +13,4 @@ pub fn test_client_uri(node_id: u32) -> ConsensusClientUri {
         .expect("Could not construct client uri from string")
 }
 
-pub use self::{blockchain::MockBlockchainConnection, user_tx::MockUserTxConnection};
+pub use crate::{blockchain::MockBlockchainConnection, user_tx::MockUserTxConnection};
diff --git a/consensus/scp/src/lib.rs b/consensus/scp/src/lib.rs
@@ -16,7 +16,7 @@ pub mod test_utils;
 mod utils;
 
 #[doc(inline)]
-pub use self::{
+pub use crate::{
     core_types::{CombineFn, GenericNodeId, Identifier, SlotIndex, ValidityFn, Value},
     msg::{Msg, Topic},
     node::{MockScpNode, Node, ScpNode},

diff --git a/transaction/core/src/membership_proofs/mod.rs b/transaction/core/src/membership_proofs/mod.rs
@@ -15,10 +15,12 @@ use mc_crypto_hashes::{Blake2b256, Digest};
 use subtle::{Choice, ConditionallySelectable, ConstantTimeEq};
 
 mod errors;
-pub use errors::Error as MembershipProofError;
-
 mod range;
-pub use range::{Range, RangeError};
+
+pub use self::{
+    errors::Error as MembershipProofError,
+    range::{Range, RangeError},
+};
 
 lazy_static! {
     pub static ref NIL_HASH: [u8; 32] = hash_nil();

diff --git a/util/build/script/src/lib.rs b/util/build/script/src/lib.rs
@@ -7,7 +7,7 @@ mod env;
 mod utils;
 mod vars;
 
-pub use self::{
+pub use crate::{
     cargo_build::CargoBuilder,
     env::{
         Endianness, EndiannessError, Environment, EnvironmentError, TargetFamily, TargetFamilyError,

diff --git a/util/logger-macros/src/lib.rs b/util/logger-macros/src/lib.rs
@@ -5,8 +5,8 @@
 extern crate proc_macro;
 
 mod error;
+use crate::error::{DiagnosticError, Result};
 
-use self::error::{DiagnosticError, Result};
 use proc_macro::TokenStream;
 use quote::quote;
 use syn::parse_quote;