summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2020-01-07 11:47:51 +0000
committerEmīls Piņķis <emils@mullvad.net>2020-01-07 11:47:51 +0000
commit90f84c1489b51dfdf02252c9250120dcef943304 (patch)
tree831b0066ec4aa4f800ac57298a0286cad8892188
parentc479171d81a77c835f41271addd226507ed4dea7 (diff)
parent2116be3d77a87be370ed48537b24431052feee01 (diff)
downloadmullvadvpn-90f84c1489b51dfdf02252c9250120dcef943304.tar.xz
mullvadvpn-90f84c1489b51dfdf02252c9250120dcef943304.zip
Merge branch 'remove-deprecated-error-description'
-rw-r--r--talpid-types/src/lib.rs4
-rw-r--r--talpid-types/src/net/mod.rs9
2 files changed, 1 insertions, 12 deletions
diff --git a/talpid-types/src/lib.rs b/talpid-types/src/lib.rs
index 00e87859a8..784cc16bdb 100644
--- a/talpid-types/src/lib.rs
+++ b/talpid-types/src/lib.rs
@@ -56,10 +56,6 @@ impl fmt::Display for BoxedError {
}
impl Error for BoxedError {
- fn description(&self) -> &str {
- self.0.description()
- }
-
fn source(&self) -> Option<&(dyn Error + 'static)> {
self.0.source()
}
diff --git a/talpid-types/src/net/mod.rs b/talpid-types/src/net/mod.rs
index b3b38331cb..bcfec414ae 100644
--- a/talpid-types/src/net/mod.rs
+++ b/talpid-types/src/net/mod.rs
@@ -2,7 +2,6 @@
use jnix::IntoJava;
use serde::{Deserialize, Serialize};
use std::{
- error::Error,
fmt,
net::{IpAddr, SocketAddr},
str::FromStr,
@@ -173,13 +172,7 @@ pub struct TransportProtocolParseError;
impl fmt::Display for TransportProtocolParseError {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
- fmt.write_str(self.description())
- }
-}
-
-impl Error for TransportProtocolParseError {
- fn description(&self) -> &str {
- "Not a valid transport protocol"
+ fmt.write_str("Not a valid transport protocol")
}
}