Merge rust-bitcoin/rust-bitcoin#2662: hashes: Do not import str

71bb86232b hashes: Do not import str (Tobin C. Harding)

Pull request description:

  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 path instead.

ACKs for top commit:
  apoelstra:
    ACK 71bb86232b trivial rebase
  sanket1729:
    ACK 71bb86232b

Tree-SHA512: 401520a5876b83ad4053bbe9b1e8cd9ff2e723cf86f95e47891a6411ad5e9af4f904e19ccaaab80d342dfe4745753c24af168dcbc8170fb6b39da08e577d30ae
This commit is contained in:
Andrew Poelstra 2024-05-04 11:42:12 +00:00
commit 343c770ee7
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
11 changed files with 8 additions and 12 deletions

View File

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

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

View File

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

View File

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

View File

@ -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<I: SliceIndex<[u8]>> Index<I> 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<Self, Self::Err> { hex::FromHex::from_hex(s) }
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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