Change Deref<Inner> impl for Hashes to Deref<[u8]>

rust-bitcoin · Jul 6, 2019 · 7812a74 · 7812a74
1 parent a175a9e
commit 7812a74
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/src/hash160.rs b/src/hash160.rs
@@ -35,7 +35,7 @@ hex_fmt_impl!(Display, Hash);
 hex_fmt_impl!(LowerHex, Hash);
 index_impl!(Hash);
 serde_impl!(Hash, 20);
-borrow_slice_impl!(Hash, [u8; 20]);
+borrow_slice_impl!(Hash);
 
 impl str::FromStr for Hash {
     type Err = Error;

diff --git a/src/ripemd160.rs b/src/ripemd160.rs
@@ -76,7 +76,7 @@ hex_fmt_impl!(Display, Hash);
 hex_fmt_impl!(LowerHex, Hash);
 index_impl!(Hash);
 serde_impl!(Hash, 20);
-borrow_slice_impl!(Hash, [u8; 20]);
+borrow_slice_impl!(Hash);
 
 impl str::FromStr for Hash {
     type Err = Error;

diff --git a/src/sha1.rs b/src/sha1.rs
@@ -63,7 +63,7 @@ hex_fmt_impl!(Display, Hash);
 hex_fmt_impl!(LowerHex, Hash);
 index_impl!(Hash);
 serde_impl!(Hash, 20);
-borrow_slice_impl!(Hash, [u8; 20]);
+borrow_slice_impl!(Hash);
 
 impl str::FromStr for Hash {
     type Err = Error;

diff --git a/src/sha256.rs b/src/sha256.rs
@@ -79,7 +79,7 @@ hex_fmt_impl!(Display, Hash);
 hex_fmt_impl!(LowerHex, Hash);
 index_impl!(Hash);
 serde_impl!(Hash, 32);
-borrow_slice_impl!(Hash, [u8; 32]);
+borrow_slice_impl!(Hash);
 
 impl HashTrait for Hash {
     type Engine = HashEngine;
@@ -151,7 +151,7 @@ hex_fmt_impl!(Display, Midstate);
 hex_fmt_impl!(LowerHex, Midstate);
 index_impl!(Midstate);
 serde_impl!(Midstate, 32);
-borrow_slice_impl!(Midstate, [u8; 32]);
+borrow_slice_impl!(Midstate);
 
 impl Midstate {
     /// Length of the midstate, in bytes.

diff --git a/src/sha256d.rs b/src/sha256d.rs
@@ -29,7 +29,7 @@ hex_fmt_impl!(Display, Hash);
 hex_fmt_impl!(LowerHex, Hash);
 index_impl!(Hash);
 serde_impl!(Hash, 32);
-borrow_slice_impl!(Hash, [u8; 32]);
+borrow_slice_impl!(Hash);
 
 impl str::FromStr for Hash {
     type Err = Error;

diff --git a/src/sha512.rs b/src/sha512.rs
@@ -127,7 +127,7 @@ hex_fmt_impl!(Display, Hash);
 hex_fmt_impl!(LowerHex, Hash);
 index_impl!(Hash);
 serde_impl!(Hash, 64);
-borrow_slice_impl!(Hash, [u8; 64]);
+borrow_slice_impl!(Hash);
 
 impl HashTrait for Hash {
     type Engine = HashEngine;

diff --git a/src/siphash24.rs b/src/siphash24.rs
@@ -209,7 +209,7 @@ hex_fmt_impl!(Display, Hash);
 hex_fmt_impl!(LowerHex, Hash);
 index_impl!(Hash);
 serde_impl!(Hash, 8);
-borrow_slice_impl!(Hash, [u8; 8]);
+borrow_slice_impl!(Hash);
 
 impl str::FromStr for Hash {
     type Err = Error;

diff --git a/src/util.rs b/src/util.rs
@@ -76,7 +76,7 @@ macro_rules! index_impl(
 );
 
 macro_rules! borrow_slice_impl(
-    ($ty:ty, $inner:ty) => (
+    ($ty:ty) => (
         impl ::std::borrow::Borrow<[u8]> for $ty {
             fn borrow(&self) -> &[u8] {
                 &self[..]
@@ -90,7 +90,7 @@ macro_rules! borrow_slice_impl(
         }
 
         impl ::std::ops::Deref for $ty {
-            type Target = $inner;
+            type Target = [u8];
 
             fn deref(&self) -> &Self::Target {
                 &self.0