diff --git a/hashes/src/hash160.rs b/hashes/src/hash160.rs index 41098a8a5..21697f79c 100644 --- a/hashes/src/hash160.rs +++ b/hashes/src/hash160.rs @@ -10,7 +10,6 @@ use core::ops::Index; use core::slice::SliceIndex; -use core::str; use crate::{ripemd160, sha256, FromSliceError}; diff --git a/hashes/src/internal_macros.rs b/hashes/src/internal_macros.rs index 9b3f9dde6..5635020ef 100644 --- a/hashes/src/internal_macros.rs +++ b/hashes/src/internal_macros.rs @@ -86,7 +86,7 @@ macro_rules! hash_trait_impls { } } - impl<$($gen: $gent),*> str::FromStr for Hash<$($gen),*> { + impl<$($gen: $gent),*> $crate::_export::_core::str::FromStr for Hash<$($gen),*> { type Err = $crate::hex::HexToArrayError; fn from_str(s: &str) -> $crate::_export::_core::result::Result { use $crate::{Hash, hex::{FromHex}}; diff --git a/hashes/src/ripemd160.rs b/hashes/src/ripemd160.rs index 1581dd242..8c204b81d 100644 --- a/hashes/src/ripemd160.rs +++ b/hashes/src/ripemd160.rs @@ -5,7 +5,7 @@ use core::ops::Index; use core::slice::SliceIndex; -use core::{cmp, str}; +use core::cmp; use crate::{FromSliceError, HashEngine as _}; diff --git a/hashes/src/sha1.rs b/hashes/src/sha1.rs index 00d8446de..663900efd 100644 --- a/hashes/src/sha1.rs +++ b/hashes/src/sha1.rs @@ -5,7 +5,7 @@ use core::ops::Index; use core::slice::SliceIndex; -use core::{cmp, str}; +use core::cmp; use crate::{FromSliceError, HashEngine as _}; diff --git a/hashes/src/sha256.rs b/hashes/src/sha256.rs index 8affa07b1..85f835d36 100644 --- a/hashes/src/sha256.rs +++ b/hashes/src/sha256.rs @@ -9,7 +9,7 @@ use core::arch::x86::*; use core::arch::x86_64::*; use core::ops::Index; use core::slice::SliceIndex; -use core::{cmp, str}; +use core::cmp; use crate::{sha256d, FromSliceError, HashEngine as _}; @@ -126,7 +126,7 @@ impl> Index for Midstate { fn index(&self, index: I) -> &Self::Output { &self.0[index] } } -impl str::FromStr for Midstate { +impl core::str::FromStr for Midstate { type Err = hex::HexToArrayError; fn from_str(s: &str) -> Result { hex::FromHex::from_hex(s) } } diff --git a/hashes/src/sha256d.rs b/hashes/src/sha256d.rs index fb3b0c5e7..3628a8783 100644 --- a/hashes/src/sha256d.rs +++ b/hashes/src/sha256d.rs @@ -5,7 +5,6 @@ use core::ops::Index; use core::slice::SliceIndex; -use core::str; use crate::{sha256, FromSliceError}; diff --git a/hashes/src/sha256t.rs b/hashes/src/sha256t.rs index 1a613cd39..e7c72a7be 100644 --- a/hashes/src/sha256t.rs +++ b/hashes/src/sha256t.rs @@ -6,7 +6,7 @@ use core::marker::PhantomData; use core::ops::Index; use core::slice::SliceIndex; -use core::{cmp, str}; +use core::cmp; use crate::{sha256, FromSliceError}; diff --git a/hashes/src/sha384.rs b/hashes/src/sha384.rs index a94387536..ce23c3118 100644 --- a/hashes/src/sha384.rs +++ b/hashes/src/sha384.rs @@ -4,7 +4,6 @@ use core::ops::Index; use core::slice::SliceIndex; -use core::str; use crate::{sha512, FromSliceError}; diff --git a/hashes/src/sha512.rs b/hashes/src/sha512.rs index ae6155f90..9e7f4be2e 100644 --- a/hashes/src/sha512.rs +++ b/hashes/src/sha512.rs @@ -5,7 +5,7 @@ use core::ops::Index; use core::slice::SliceIndex; -use core::{cmp, str}; +use core::cmp; use crate::{FromSliceError, HashEngine as _}; diff --git a/hashes/src/sha512_256.rs b/hashes/src/sha512_256.rs index e5c366247..bcaee9216 100644 --- a/hashes/src/sha512_256.rs +++ b/hashes/src/sha512_256.rs @@ -9,7 +9,6 @@ use core::ops::Index; use core::slice::SliceIndex; -use core::str; use crate::{sha512, FromSliceError}; diff --git a/hashes/src/siphash24.rs b/hashes/src/siphash24.rs index a20c1d331..81434aef5 100644 --- a/hashes/src/siphash24.rs +++ b/hashes/src/siphash24.rs @@ -5,7 +5,7 @@ use core::ops::Index; use core::slice::SliceIndex; -use core::{cmp, mem, ptr, str}; +use core::{cmp, mem, ptr}; use crate::{FromSliceError, Hash as _, HashEngine as _};