Return Result<Self, Self::Err> in FromStr impls

If we return `Self, Self::Err` then the implementations of `FromStr` are easier to maintain.
rust-bitcoin · Jul 26, 2023 · c06263d · c06263d
1 parent 29e1a0c
commit c06263d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/ecdh.rs b/src/ecdh.rs
@@ -79,7 +79,7 @@ impl SharedSecret {
 
 impl str::FromStr for SharedSecret {
     type Err = Error;
-    fn from_str(s: &str) -> Result<SharedSecret, Error> {
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
         let mut res = [0u8; SHARED_SECRET_SIZE];
         match crate::from_hex(s, &mut res) {
             Ok(SHARED_SECRET_SIZE) => Ok(SharedSecret::from_bytes(res)),

diff --git a/src/ecdsa/mod.rs b/src/ecdsa/mod.rs
@@ -37,7 +37,7 @@ impl fmt::Display for Signature {
 
 impl str::FromStr for Signature {
     type Err = Error;
-    fn from_str(s: &str) -> Result<Signature, Error> {
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
         let mut res = [0u8; 72];
         match from_hex(s, &mut res) {
             Ok(x) => Signature::from_der(&res[0..x]),

diff --git a/src/key.rs b/src/key.rs
@@ -106,7 +106,7 @@ impl ffi::CPtr for SecretKey {
 
 impl str::FromStr for SecretKey {
     type Err = Error;
-    fn from_str(s: &str) -> Result<SecretKey, Error> {
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
         let mut res = [0u8; constants::SECRET_KEY_SIZE];
         match from_hex(s, &mut res) {
             Ok(constants::SECRET_KEY_SIZE) => SecretKey::from_slice(&res),
@@ -159,7 +159,7 @@ impl fmt::Display for PublicKey {
 
 impl str::FromStr for PublicKey {
     type Err = Error;
-    fn from_str(s: &str) -> Result<PublicKey, Error> {
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
         let mut res = [0u8; constants::UNCOMPRESSED_PUBLIC_KEY_SIZE];
         match from_hex(s, &mut res) {
             Ok(constants::PUBLIC_KEY_SIZE) =>
@@ -1111,7 +1111,7 @@ impl fmt::Display for XOnlyPublicKey {
 
 impl str::FromStr for XOnlyPublicKey {
     type Err = Error;
-    fn from_str(s: &str) -> Result<XOnlyPublicKey, Error> {
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
         let mut res = [0u8; constants::SCHNORR_PUBLIC_KEY_SIZE];
         match from_hex(s, &mut res) {
             Ok(constants::SCHNORR_PUBLIC_KEY_SIZE) =>

diff --git a/src/schnorr.rs b/src/schnorr.rs
@@ -64,7 +64,7 @@ impl fmt::Display for Signature {
 
 impl str::FromStr for Signature {
     type Err = Error;
-    fn from_str(s: &str) -> Result<Signature, Error> {
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
         let mut res = [0u8; constants::SCHNORR_SIGNATURE_SIZE];
         match from_hex(s, &mut res) {
             Ok(constants::SCHNORR_SIGNATURE_SIZE) =>