From 360d1fb1bb5df0a1e56551fe96c59d42a1c57340 Mon Sep 17 00:00:00 2001
From: "Tobin C. Harding" <me@tobin.cc>
Date: Fri, 12 Jul 2024 12:53:56 +1000
Subject: [PATCH] hashes: Use $crate in macro

Depending on types being in scope when calling macros is bad practice
but we have mistakenly done so in `internal_macros` when using the
`FromSliceError`.

Use `$crate::FromSliceError` in the macro and remove import statements.
---
 hashes/src/hash160.rs         | 2 +-
 hashes/src/internal_macros.rs | 6 +++---
 hashes/src/ripemd160.rs       | 2 +-
 hashes/src/sha1.rs            | 2 +-
 hashes/src/sha256d.rs         | 2 +-
 hashes/src/sha384.rs          | 2 +-
 hashes/src/sha512.rs          | 2 +-
 hashes/src/sha512_256.rs      | 2 +-
 hashes/src/siphash24.rs       | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/hashes/src/hash160.rs b/hashes/src/hash160.rs
index f3065196d..10cfeb2e3 100644
--- a/hashes/src/hash160.rs
+++ b/hashes/src/hash160.rs
@@ -10,7 +10,7 @@
 use core::ops::Index;
 use core::slice::SliceIndex;
 
-use crate::{ripemd160, sha256, FromSliceError};
+use crate::{ripemd160, sha256};
 
 crate::internal_macros::hash_type! {
     160,
diff --git a/hashes/src/internal_macros.rs b/hashes/src/internal_macros.rs
index 82445d67e..72ac69bca 100644
--- a/hashes/src/internal_macros.rs
+++ b/hashes/src/internal_macros.rs
@@ -113,7 +113,7 @@ macro_rules! hash_trait_impls {
             const LEN: usize = $bits / 8;
             const DISPLAY_BACKWARD: bool = $reverse;
 
-            fn from_slice(sl: &[u8]) -> $crate::_export::_core::result::Result<Hash<$($gen),*>, FromSliceError> {
+            fn from_slice(sl: &[u8]) -> $crate::_export::_core::result::Result<Hash<$($gen),*>, $crate::FromSliceError> {
                 Self::from_slice(sl)
             }
 
@@ -174,9 +174,9 @@ macro_rules! hash_type {
             /// Copies a byte slice into a hash object.
             pub fn from_slice(
                 sl: &[u8],
-            ) -> $crate::_export::_core::result::Result<Hash, FromSliceError> {
+            ) -> $crate::_export::_core::result::Result<Hash, $crate::FromSliceError> {
                 if sl.len() != $bits / 8 {
-                    Err(FromSliceError { expected: $bits / 8, got: sl.len() })
+                    Err($crate::FromSliceError { expected: $bits / 8, got: sl.len() })
                 } else {
                     let mut ret = [0; $bits / 8];
                     ret.copy_from_slice(sl);
diff --git a/hashes/src/ripemd160.rs b/hashes/src/ripemd160.rs
index 34f43a601..eef1ad96f 100644
--- a/hashes/src/ripemd160.rs
+++ b/hashes/src/ripemd160.rs
@@ -6,7 +6,7 @@ use core::cmp;
 use core::ops::Index;
 use core::slice::SliceIndex;
 
-use crate::{FromSliceError, HashEngine as _};
+use crate::HashEngine as _;
 
 crate::internal_macros::hash_type! {
     160,
diff --git a/hashes/src/sha1.rs b/hashes/src/sha1.rs
index 0ab25ff78..e0ce68354 100644
--- a/hashes/src/sha1.rs
+++ b/hashes/src/sha1.rs
@@ -6,7 +6,7 @@ use core::cmp;
 use core::ops::Index;
 use core::slice::SliceIndex;
 
-use crate::{FromSliceError, HashEngine as _};
+use crate::HashEngine as _;
 
 crate::internal_macros::hash_type! {
     160,
diff --git a/hashes/src/sha256d.rs b/hashes/src/sha256d.rs
index 175f1bae9..040436603 100644
--- a/hashes/src/sha256d.rs
+++ b/hashes/src/sha256d.rs
@@ -5,7 +5,7 @@
 use core::ops::Index;
 use core::slice::SliceIndex;
 
-use crate::{sha256, FromSliceError};
+use crate::sha256;
 
 crate::internal_macros::hash_type! {
     256,
diff --git a/hashes/src/sha384.rs b/hashes/src/sha384.rs
index 53db4e43f..900d542c7 100644
--- a/hashes/src/sha384.rs
+++ b/hashes/src/sha384.rs
@@ -5,7 +5,7 @@
 use core::ops::Index;
 use core::slice::SliceIndex;
 
-use crate::{sha512, FromSliceError};
+use crate::sha512;
 
 crate::internal_macros::hash_type! {
     384,
diff --git a/hashes/src/sha512.rs b/hashes/src/sha512.rs
index 77997a0e3..8dd2f6024 100644
--- a/hashes/src/sha512.rs
+++ b/hashes/src/sha512.rs
@@ -6,7 +6,7 @@ use core::cmp;
 use core::ops::Index;
 use core::slice::SliceIndex;
 
-use crate::{FromSliceError, HashEngine as _};
+use crate::HashEngine as _;
 
 crate::internal_macros::hash_type! {
     512,
diff --git a/hashes/src/sha512_256.rs b/hashes/src/sha512_256.rs
index 413152196..d08a0eae2 100644
--- a/hashes/src/sha512_256.rs
+++ b/hashes/src/sha512_256.rs
@@ -10,7 +10,7 @@
 use core::ops::Index;
 use core::slice::SliceIndex;
 
-use crate::{sha512, FromSliceError};
+use crate::sha512;
 
 crate::internal_macros::hash_type! {
     256,
diff --git a/hashes/src/siphash24.rs b/hashes/src/siphash24.rs
index ce45cbb37..6ba153fd4 100644
--- a/hashes/src/siphash24.rs
+++ b/hashes/src/siphash24.rs
@@ -6,7 +6,7 @@ use core::ops::Index;
 use core::slice::SliceIndex;
 use core::{cmp, mem, ptr};
 
-use crate::{FromSliceError, HashEngine as _};
+use crate::HashEngine as _;
 
 crate::internal_macros::hash_type! {
     64,