Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hashes: Do not import str #2662

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion hashes/src/hash160.rs
Expand Up @@ -10,7 +10,6 @@

use core::ops::Index;
use core::slice::SliceIndex;
use core::str;

use crate::{ripemd160, sha256, FromSliceError};

Expand Down
2 changes: 1 addition & 1 deletion hashes/src/internal_macros.rs
Expand Up @@ -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}};
Expand Down
2 changes: 1 addition & 1 deletion hashes/src/ripemd160.rs
Expand Up @@ -5,7 +5,7 @@

use core::ops::Index;
use core::slice::SliceIndex;
use core::{cmp, str};
use core::cmp;

use crate::{FromSliceError, HashEngine as _};

Expand Down
2 changes: 1 addition & 1 deletion hashes/src/sha1.rs
Expand Up @@ -5,7 +5,7 @@

use core::ops::Index;
use core::slice::SliceIndex;
use core::{cmp, str};
use core::cmp;

use crate::{FromSliceError, HashEngine as _};

Expand Down
4 changes: 2 additions & 2 deletions hashes/src/sha256.rs
Expand Up @@ -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 _};

Expand Down Expand Up @@ -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) }
}
Expand Down
1 change: 0 additions & 1 deletion hashes/src/sha256d.rs
Expand Up @@ -5,7 +5,6 @@

use core::ops::Index;
use core::slice::SliceIndex;
use core::str;

use crate::{sha256, FromSliceError};

Expand Down
2 changes: 1 addition & 1 deletion hashes/src/sha256t.rs
Expand Up @@ -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};

Expand Down
1 change: 0 additions & 1 deletion hashes/src/sha384.rs
Expand Up @@ -4,7 +4,6 @@

use core::ops::Index;
use core::slice::SliceIndex;
use core::str;

use crate::{sha512, FromSliceError};

Expand Down
2 changes: 1 addition & 1 deletion hashes/src/sha512.rs
Expand Up @@ -5,7 +5,7 @@

use core::ops::Index;
use core::slice::SliceIndex;
use core::{cmp, str};
use core::cmp;

use crate::{FromSliceError, HashEngine as _};

Expand Down
1 change: 0 additions & 1 deletion hashes/src/sha512_256.rs
Expand Up @@ -9,7 +9,6 @@

use core::ops::Index;
use core::slice::SliceIndex;
use core::str;

use crate::{sha512, FromSliceError};

Expand Down
2 changes: 1 addition & 1 deletion hashes/src/siphash24.rs
Expand Up @@ -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 _};

Expand Down