milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

hashes: Do not import str 

Depending on things being in scope for macros to use is bad form,
using the fully qualified path is the correct way.

Do not import `str` instead use the fully qualified path to the `core`
re-export.

Use fully qualified instead.
This commit is contained in:
Tobin C. Harding 2024-04-04 12:24:03 +11:00
parent bae2c75f69
commit 71bb86232b
No known key found for this signature in database
GPG Key ID: 40BF9E4C269D6607
11 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hashes/src/hash160.rs
View File

@ -10,7 +10,6 @@
use core::ops::Index; use core::ops::Index;
use core::slice::SliceIndex; use core::slice::SliceIndex;
use core::str;
use crate::{ripemd160, sha256, FromSliceError}; use crate::{ripemd160, sha256, FromSliceError};

2
hashes/src/internal_macros.rs
View File

@ -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; type Err = $crate::hex::HexToArrayError;
fn from_str(s: &str) -> $crate::_export::_core::result::Result<Self, Self::Err> { fn from_str(s: &str) -> $crate::_export::_core::result::Result<Self, Self::Err> {
use $crate::{Hash, hex::{FromHex}}; use $crate::{Hash, hex::{FromHex}};

2
hashes/src/ripemd160.rs
View File

@ -5,7 +5,7 @@
use core::ops::Index; use core::ops::Index;
use core::slice::SliceIndex; use core::slice::SliceIndex;
use core::{cmp, str}; use core::cmp;
use crate::{FromSliceError, HashEngine as _}; use crate::{FromSliceError, HashEngine as _};

2
hashes/src/sha1.rs
View File

@ -5,7 +5,7 @@
use core::ops::Index; use core::ops::Index;
use core::slice::SliceIndex; use core::slice::SliceIndex;
use core::{cmp, str}; use core::cmp;
use crate::{FromSliceError, HashEngine as _}; use crate::{FromSliceError, HashEngine as _};

4
hashes/src/sha256.rs
View File

@ -9,7 +9,7 @@ use core::arch::x86::*;
use core::arch::x86_64::*; use core::arch::x86_64::*;
use core::ops::Index; use core::ops::Index;
use core::slice::SliceIndex; use core::slice::SliceIndex;
use core::{cmp, str}; use core::cmp;
use crate::{sha256d, FromSliceError, HashEngine as _}; use crate::{sha256d, FromSliceError, HashEngine as _};
@ -126,7 +126,7 @@ impl<I: SliceIndex<[u8]>> Index<I> for Midstate {
fn index(&self, index: I) -> &Self::Output { &self.0[index] } 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; type Err = hex::HexToArrayError;
fn from_str(s: &str) -> Result<Self, Self::Err> { hex::FromHex::from_hex(s) } fn from_str(s: &str) -> Result<Self, Self::Err> { hex::FromHex::from_hex(s) }
} }

1
hashes/src/sha256d.rs
View File

@ -5,7 +5,6 @@
use core::ops::Index; use core::ops::Index;
use core::slice::SliceIndex; use core::slice::SliceIndex;
use core::str;
use crate::{sha256, FromSliceError}; use crate::{sha256, FromSliceError};

2
hashes/src/sha256t.rs
View File

@ -6,7 +6,7 @@
use core::marker::PhantomData; use core::marker::PhantomData;
use core::ops::Index; use core::ops::Index;
use core::slice::SliceIndex; use core::slice::SliceIndex;
use core::{cmp, str}; use core::cmp;
use crate::{sha256, FromSliceError}; use crate::{sha256, FromSliceError};

1
hashes/src/sha384.rs
View File

@ -4,7 +4,6 @@
use core::ops::Index; use core::ops::Index;
use core::slice::SliceIndex; use core::slice::SliceIndex;
use core::str;
use crate::{sha512, FromSliceError}; use crate::{sha512, FromSliceError};

2
hashes/src/sha512.rs
View File

@ -5,7 +5,7 @@
use core::ops::Index; use core::ops::Index;
use core::slice::SliceIndex; use core::slice::SliceIndex;
use core::{cmp, str}; use core::cmp;
use crate::{FromSliceError, HashEngine as _}; use crate::{FromSliceError, HashEngine as _};

1
hashes/src/sha512_256.rs
View File

@ -9,7 +9,6 @@
use core::ops::Index; use core::ops::Index;
use core::slice::SliceIndex; use core::slice::SliceIndex;
use core::str;
use crate::{sha512, FromSliceError}; use crate::{sha512, FromSliceError};

2
hashes/src/siphash24.rs
View File

@ -5,7 +5,7 @@
use core::ops::Index; use core::ops::Index;
use core::slice::SliceIndex; use core::slice::SliceIndex;
use core::{cmp, mem, ptr, str}; use core::{cmp, mem, ptr};
use crate::{FromSliceError, Hash as _, HashEngine as _}; use crate::{FromSliceError, Hash as _, HashEngine as _};