From 71bb86232bc8b21ba746ca5bbab0acd96cb85b46 Mon Sep 17 00:00:00 2001
From: "Tobin C. Harding" <me@tobin.cc>
Date: Thu, 4 Apr 2024 12:24:03 +1100
Subject: [PATCH] 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.
---
 hashes/src/hash160.rs         | 1 -
 hashes/src/internal_macros.rs | 2 +-
 hashes/src/ripemd160.rs       | 2 +-
 hashes/src/sha1.rs            | 2 +-
 hashes/src/sha256.rs          | 4 ++--
 hashes/src/sha256d.rs         | 1 -
 hashes/src/sha256t.rs         | 2 +-
 hashes/src/sha384.rs          | 1 -
 hashes/src/sha512.rs          | 2 +-
 hashes/src/sha512_256.rs      | 1 -
 hashes/src/siphash24.rs       | 2 +-
 11 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/hashes/src/hash160.rs b/hashes/src/hash160.rs
index 41098a8a5d..21697f79c9 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 9b3f9dde6f..5635020ef2 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<Self, Self::Err> {
                 use $crate::{Hash, hex::{FromHex}};
diff --git a/hashes/src/ripemd160.rs b/hashes/src/ripemd160.rs
index 1581dd242d..8c204b81db 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 00d8446dec..663900efd4 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 2d03fdd70e..5928d4d9c6 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<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) }
 }
diff --git a/hashes/src/sha256d.rs b/hashes/src/sha256d.rs
index fb3b0c5e79..3628a87832 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 1a613cd396..e7c72a7be2 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 a943875362..ce23c3118a 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 ae6155f90f..9e7f4be2ed 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 e5c3662476..bcaee9216b 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 a20c1d3317..81434aef54 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 _};