Take advantage of shorter generic Key

Now we have `Key` instead of `MiniscriptKey` we can take advantage of
the shorter name to inline the where clauses when appropriate.

Author: tcharding

src/descriptor/bare.rs

@@ -181,11 +181,7 @@ impl<Pk: Key> ForEachKey<Pk> for Bare<Pk> {
     }
 }
 
-impl<P, Q> TranslatePk<P, Q> for Bare<P>
-where
-    P: Key,
-    Q: Key,
-{
+impl<P: Key, Q: Key> TranslatePk<P, Q> for Bare<P> {
     type Output = Bare<Q>;
 
     fn translate_pk<T, E>(&self, t: &mut T) -> Result<Bare<Q>, TranslateErr<E>>
@@ -366,11 +362,7 @@ impl<Pk: Key> ForEachKey<Pk> for Pkh<Pk> {
     }
 }
 
-impl<P, Q> TranslatePk<P, Q> for Pkh<P>
-where
-    P: Key,
-    Q: Key,
-{
+impl<P: Key, Q: Key> TranslatePk<P, Q> for Pkh<P> {
     type Output = Pkh<Q>;
 
     fn translate_pk<T, E>(&self, t: &mut T) -> Result<Self::Output, TranslateErr<E>>

src/descriptor/mod.rs

@@ -511,11 +511,7 @@ impl<Pk: Key + ToPublicKey> Descriptor<Pk> {
     }
 }
 
-impl<P, Q> TranslatePk<P, Q> for Descriptor<P>
-where
-    P: Key,
-    Q: Key,
-{
+impl<P: Key, Q: Key> TranslatePk<P, Q> for Descriptor<P> {
     type Output = Descriptor<Q>;
 
     /// Converts a descriptor using abstract keys to one using specific keys.

src/descriptor/segwitv0.rs

@@ -275,11 +275,7 @@ impl<Pk: Key> ForEachKey<Pk> for Wsh<Pk> {
     }
 }
 
-impl<P, Q> TranslatePk<P, Q> for Wsh<P>
-where
-    P: Key,
-    Q: Key,
-{
+impl<P: Key, Q: Key> TranslatePk<P, Q> for Wsh<P> {
     type Output = Wsh<Q>;
 
     fn translate_pk<T, E>(&self, t: &mut T) -> Result<Self::Output, TranslateErr<E>>
@@ -473,11 +469,7 @@ impl<Pk: Key> ForEachKey<Pk> for Wpkh<Pk> {
     }
 }
 
-impl<P, Q> TranslatePk<P, Q> for Wpkh<P>
-where
-    P: Key,
-    Q: Key,
-{
+impl<P: Key, Q: Key> TranslatePk<P, Q> for Wpkh<P> {
     type Output = Wpkh<Q>;
 
     fn translate_pk<T, E>(&self, t: &mut T) -> Result<Self::Output, TranslateErr<E>>

src/descriptor/sh.rs

@@ -430,11 +430,7 @@ impl<Pk: Key> ForEachKey<Pk> for Sh<Pk> {
     }
 }
 
-impl<P, Q> TranslatePk<P, Q> for Sh<P>
-where
-    P: Key,
-    Q: Key,
-{
+impl<P: Key, Q: Key> TranslatePk<P, Q> for Sh<P> {
     type Output = Sh<Q>;
 
     fn translate_pk<T, E>(&self, t: &mut T) -> Result<Self::Output, TranslateErr<E>>

src/descriptor/tr.rs

@@ -623,11 +623,7 @@ impl<Pk: Key> ForEachKey<Pk> for Tr<Pk> {
     }
 }
 
-impl<P, Q> TranslatePk<P, Q> for Tr<P>
-where
-    P: Key,
-    Q: Key,
-{
+impl<P: Key, Q: Key> TranslatePk<P, Q> for Tr<P> {
     type Output = Tr<Q>;
 
     fn translate_pk<T, E>(&self, translate: &mut T) -> Result<Self::Output, TranslateErr<E>>

src/lib.rs

@@ -426,11 +426,7 @@ impl<E: fmt::Debug> fmt::Debug for TranslateErr<E> {
 
 /// Converts a descriptor using abstract keys to one using specific keys. Uses translator `t` to do
 /// the actual translation function calls.
-pub trait TranslatePk<P, Q>
-where
-    P: Key,
-    Q: Key,
-{
+pub trait TranslatePk<P: Key, Q: Key> {
     /// The associated output type. This must be `Self<Q>`.
     type Output;