Remove deprecated Error::description impl

rust-bitcoin · Oct 8, 2020 · fa33b1c · fa33b1c
1 parent 5438430
commit fa33b1c
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 68 deletions.
diff --git a/src/blockdata/script.rs b/src/blockdata/script.rs
@@ -120,12 +120,7 @@ impl fmt::Display for Error {
     }
 }
 
-#[allow(deprecated)]
-impl error::Error for Error {
-    fn description(&self) -> &str {
-        "description() is deprecated; use Display"
-    }
-}
+impl error::Error for Error {}
 
 #[cfg(feature="bitcoinconsensus")]
 #[doc(hidden)]

diff --git a/src/blockdata/transaction.rs b/src/blockdata/transaction.rs
@@ -128,12 +128,7 @@ impl fmt::Display for ParseOutPointError {
     }
 }
 
-#[allow(deprecated)]
 impl error::Error for ParseOutPointError {
-    fn description(&self) -> &str {
-        "description() is deprecated; use Display"
-    }
-
     fn cause(&self) -> Option<&dyn error::Error> {
         match *self {
             ParseOutPointError::Txid(ref e) => Some(e),

diff --git a/src/consensus/encode.rs b/src/consensus/encode.rs
@@ -109,7 +109,6 @@ impl fmt::Display for Error {
     }
 }
 
-#[allow(deprecated)]
 impl error::Error for Error {
     fn cause(&self) -> Option<&dyn error::Error> {
         match *self {
@@ -126,10 +125,6 @@ impl error::Error for Error {
             | Error::UnknownInventoryType(..) => None,
         }
     }
-
-    fn description(&self) -> &str {
-        "description() is deprecated; use Display"
-    }
 }
 
 #[doc(hidden)]

diff --git a/src/network/mod.rs b/src/network/mod.rs
@@ -60,11 +60,7 @@ impl From<io::Error> for Error {
     }
 }
 
-#[allow(deprecated)]
 impl error::Error for Error {
-    fn description(&self) -> &str {
-        "description() is deprecated; use Display"
-    }
 
     fn cause(&self) -> Option<&dyn error::Error> {
         match *self {

diff --git a/src/util/address.rs b/src/util/address.rs
@@ -87,7 +87,6 @@ impl fmt::Display for Error {
     }
 }
 
-#[allow(deprecated)]
 impl error::Error for Error {
     fn cause(&self) -> Option<&dyn error::Error> {
         match *self {
@@ -96,10 +95,6 @@ impl error::Error for Error {
             _ => None,
         }
     }
-
-    fn description(&self) -> &str {
-        "description() is deprecated; use Display"
-    }
 }
 
 #[doc(hidden)]

diff --git a/src/util/amount.rs b/src/util/amount.rs
@@ -115,13 +115,7 @@ impl fmt::Display for ParseAmountError {
     }
 }
 
-#[allow(deprecated)]
-impl error::Error for ParseAmountError {
-    fn description(&self) -> &str {
-        "description() is deprecated; use Display"
-    }
-}
-
+impl error::Error for ParseAmountError {}
 
 fn is_too_precise(s: &str, precision: usize) -> bool {
     s.contains('.') || precision >= s.len() || s.chars().rev().take(precision).any(|d| d != '0')

diff --git a/src/util/base58.rs b/src/util/base58.rs
@@ -52,12 +52,7 @@ impl fmt::Display for Error {
     }
 }
 
-#[allow(deprecated)]
-impl error::Error for Error {
-    fn description(&self) -> &str {
-        "description() is deprecated; use Display"
-    }
-}
+impl error::Error for Error {}
 
 /// Vector-like object that holds the first 100 elements on the stack. If more space is needed it
 /// will be allocated on the heap.

diff --git a/src/util/bip158.rs b/src/util/bip158.rs
@@ -75,12 +75,7 @@ pub enum Error {
     Io(io::Error),
 }
 
-#[allow(deprecated)]
-impl error::Error for Error {
-    fn description(&self) -> &str {
-        "description() is deprecated; use Display"
-    }
-}
+impl error::Error for Error {}
 
 impl Display for Error {
     fn fmt(&self, f: &mut Formatter) -> Result<(), fmt::Error> {

diff --git a/src/util/bip32.rs b/src/util/bip32.rs
@@ -409,10 +409,6 @@ impl error::Error for Error {
            None
        }
     }
-
-    fn description(&self) -> &str {
-        "description() is deprecated; use Display"
-    }
 }
 
 impl From<secp256k1::Error> for Error {

diff --git a/src/util/contracthash.rs b/src/util/contracthash.rs
@@ -71,7 +71,6 @@ impl fmt::Display for Error {
     }
 }
 
-#[allow(deprecated)]
 impl error::Error for Error {
     fn cause(&self) -> Option<&dyn error::Error> {
         match *self {
@@ -80,10 +79,6 @@ impl error::Error for Error {
             _ => None
         }
     }
-
-    fn description(&self) -> &str {
-        "description() is deprecated; use Display"
-    }
 }
 
 /// An element of a script template

diff --git a/src/util/key.rs b/src/util/key.rs
@@ -52,10 +52,6 @@ impl error::Error for Error {
             Error::Secp256k1(ref e) => Some(e),
         }
     }
-
-    fn description(&self) -> &str {
-        "description() is deprecated; use Display"
-    }
 }
 
 #[doc(hidden)]

diff --git a/src/util/mod.rs b/src/util/mod.rs
@@ -83,7 +83,6 @@ impl fmt::Display for Error {
     }
 }
 
-#[allow(deprecated)]
 impl error::Error for Error {
     fn cause(&self) -> Option<&dyn error::Error> {
         match *self {
@@ -92,10 +91,6 @@ impl error::Error for Error {
             Error::BlockBadProofOfWork | Error::BlockBadTarget => None
         }
     }
-
-    fn description(&self) -> &str {
-        "description() is deprecated; use Display"
-    }
 }
 
 #[doc(hidden)]

diff --git a/src/util/psbt/error.rs b/src/util/psbt/error.rs
@@ -69,9 +69,4 @@ impl fmt::Display for Error {
     }
 }
 
-#[allow(deprecated)]
-impl error::Error for Error {
-    fn description(&self) -> &str {
-        "description() is deprecated; use Display"
-    }
-}
+impl error::Error for Error {}