Replace err_derive with thiserror

`err_derive` is unmaintained and will probably stop working with rust
edition 2024. `thiserror` is almost a drop-in replacement. This commit
simply replaces all occurences of `derive(err_derive::Error)` with
`derive(thiserror::Error)` and fixes the attributes, but the Error and
Display impls should be identical.

Author: hulthe

Cargo.lock

@@ -56,7 +56,7 @@ prost = "0.12.0"
 prost-types = "0.12.0"
 
 env_logger = "0.10.0"
-err-derive = "0.3.1"
+thiserror = "1.0.57"
 log = "0.4"
 
 shadowsocks = { version = "1.16" }

Cargo.toml

@@ -11,7 +11,7 @@ rust-version.workspace = true
 workspace = true
 
 [dependencies]
-err-derive = { workspace = true }
+thiserror = { workspace = true }
 htmlize = { version = "1.0.2", features = ["unescape"] }
 once_cell = { workspace = true }
 regex = "1"

android/translations-converter/Cargo.toml

@@ -103,13 +103,13 @@ impl From<MsgString> for MsgValue {
     }
 }
 
-#[derive(Debug, err_derive::Error)]
+#[derive(Debug, thiserror::Error)]
 pub enum Error {
     /// Parser error while parsing file
-    #[error(display = "Failed to parse input file")]
-    Parse(#[error(source)] super::parser::Error),
+    #[error("Failed to parse input file")]
+    Parse(#[from] super::parser::Error),
 
     /// IO error while reading input file.
-    #[error(display = "Failed to read from the input file")]
-    Io(#[error(source)] std::io::Error),
+    #[error("Failed to read from the input file")]
+    Io(#[from] std::io::Error),
 }

android/translations-converter/src/gettext/messages.rs

@@ -526,35 +526,29 @@ fn collect_variants(
 }
 
 /// Parsing errors.
-#[derive(Clone, Debug, Eq, PartialEq, err_derive::Error)]
+#[derive(Clone, Debug, Eq, PartialEq, thiserror::Error)]
 pub enum Error {
     /// An unexpected line was read while parsing.
-    #[error(display = "Unexpected line parsing gettext messages: {}", _0)]
+    #[error("Unexpected line parsing gettext messages: {0}")]
     UnexpectedLine(String),
 
     /// Input uses an unrecognized plural forumal.
-    #[error(
-        display = "Input uses an unrecognized formula for the plural form: {}",
-        _0
-    )]
+    #[error("Input uses an unrecognized formula for the plural form: {0}")]
     UnrecognizedPluralFormula(String),
 
     /// Input ended with an incomplete entry.
-    #[error(
-        display = "Input ended with an incomplete gettext entry with ID: {}",
-        _0
-    )]
+    #[error("Input ended with an incomplete gettext entry with ID: {0}")]
     IncompleteEntry(MsgString),
 
     /// Plural entry definition is missing a plural variant.
-    #[error(display = "Plural entry is missing a plural variant: {}", _0)]
+    #[error("Plural entry is missing a plural variant: {0}")]
     IncompletePluralEntry(MsgString),
 
     /// Plural variant is invalid.
-    #[error(display = "Plural variant line is invalid: {}", _0)]
+    #[error("Plural variant line is invalid: {0}")]
     InvalidPluralVariant(String),
 
     /// Plural variant index was not parsable.
-    #[error(display = "Plural variant line contains an invalid index: {}", _0)]
+    #[error("Plural variant line contains an invalid index: {0}")]
     InvalidPluralIndex(String),
 }

android/translations-converter/src/gettext/parser.rs

@@ -44,6 +44,6 @@ impl FromStr for PluralForm {
 /// Failed to create [`PluralForm`] from specified plural formula.
 ///
 /// The formula could be an invalid formula, or support for it hasn't been added yet.
-#[derive(Clone, Debug, err_derive::Error)]
-#[error(display = "Unsupported plural formula: {}", _0)]
+#[derive(Clone, Debug, thiserror::Error)]
+#[error("Unsupported plural formula: {0}")]
 pub struct UnsupportedPluralFormulaError(String);

android/translations-converter/src/gettext/plural_form.rs

@@ -17,7 +17,7 @@ api-override = []
 [dependencies]
 libc = "0.2"
 chrono = { workspace = true }
-err-derive = { workspace = true }
+thiserror = { workspace = true }
 futures = "0.3"
 http = "0.2"
 hyper = { version = "0.14", features = ["client", "stream", "http1", "tcp" ] }

mullvad-api/Cargo.toml

@@ -12,8 +12,8 @@ use std::{
 };
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 
-#[derive(err_derive::Error, Debug)]
-#[error(display = "Stream is closed")]
+#[derive(thiserror::Error, Debug)]
+#[error("Stream is closed")]
 pub struct Aborted(());
 
 #[derive(Clone, Debug)]

mullvad-api/src/abortable_stream.rs

@@ -8,20 +8,19 @@ use tokio::{
     sync::Mutex,
 };
 
-#[derive(err_derive::Error, Debug)]
-#[error(no_from)]
+#[derive(thiserror::Error, Debug)]
 pub enum Error {
-    #[error(display = "Failed to open the address cache file")]
-    Open(#[error(source)] io::Error),
+    #[error("Failed to open the address cache file")]
+    Open(#[source] io::Error),
 
-    #[error(display = "Failed to read the address cache file")]
-    Read(#[error(source)] io::Error),
+    #[error("Failed to read the address cache file")]
+    Read(#[source] io::Error),
 
-    #[error(display = "Failed to parse the address cache file")]
+    #[error("Failed to parse the address cache file")]
     Parse,
 
-    #[error(display = "Failed to update the address cache file")]
-    Write(#[error(source)] io::Error),
+    #[error("Failed to update the address cache file")]
+    Write(#[source] io::Error),
 }
 
 #[derive(Clone)]

mullvad-api/src/address_cache.rs

@@ -11,11 +11,11 @@ const CHANNEL_CAPACITY: usize = 100;
 /// called for this long.
 const INACTIVITY_TIME: Duration = Duration::from_secs(3 * 24 * 60 * 60);
 
-#[derive(err_derive::Error, Debug)]
+#[derive(thiserror::Error, Debug)]
 pub enum Error {
     /// The [`ApiAvailability`] instance was dropped, or the receiver lagged behind.
-    #[error(display = "API availability instance was dropped")]
-    Interrupted(#[error(source)] broadcast::error::RecvError),
+    #[error("API availability instance was dropped")]
+    Interrupted(#[from] broadcast::error::RecvError),
 }
 
 #[derive(PartialEq, Eq, Clone, Copy, Debug, Default)]

mullvad-api/src/availability.rs

@@ -222,9 +222,9 @@ struct SocksConfig {
     authentication: Option<proxy::SocksAuth>,
 }
 
-#[derive(err_derive::Error, Debug)]
+#[derive(thiserror::Error, Debug)]
 enum ProxyConfigError {
-    #[error(display = "Unrecognized cipher selected: {}", _0)]
+    #[error("Unrecognized cipher selected: {0}")]
     InvalidCipher(String),
 }
 

mullvad-api/src/https_client_with_sni.rs

@@ -314,16 +314,16 @@ pub struct Runtime {
     socket_bypass_tx: Option<mpsc::Sender<SocketBypassRequest>>,
 }
 
-#[derive(err_derive::Error, Debug)]
+#[derive(thiserror::Error, Debug)]
 pub enum Error {
-    #[error(display = "Failed to construct a rest client")]
-    RestError(#[error(source)] rest::Error),
+    #[error("Failed to construct a rest client")]
+    RestError(#[from] rest::Error),
 
-    #[error(display = "Failed to load address cache")]
-    AddressCacheError(#[error(source)] address_cache::Error),
+    #[error("Failed to load address cache")]
+    AddressCacheError(#[from] address_cache::Error),
 
-    #[error(display = "API availability check failed")]
-    ApiCheckError(#[error(source)] availability::Error),
+    #[error("API availability check failed")]
+    ApiCheckError(#[from] availability::Error),
 }
 
 impl Runtime {

mullvad-api/src/lib.rs

@@ -34,38 +34,38 @@ pub type Result<T> = std::result::Result<T, Error>;
 const DEFAULT_TIMEOUT: Duration = Duration::from_secs(10);
 
 /// Describes all the ways a REST request can fail
-#[derive(err_derive::Error, Debug, Clone)]
+#[derive(thiserror::Error, Debug, Clone)]
 pub enum Error {
-    #[error(display = "REST client service is down")]
+    #[error("REST client service is down")]
     RestServiceDown,
 
-    #[error(display = "Request cancelled")]
+    #[error("Request cancelled")]
     Aborted,
 
-    #[error(display = "Hyper error")]
-    HyperError(#[error(source)] Arc<hyper::Error>),
+    #[error("Hyper error")]
+    HyperError(#[from] Arc<hyper::Error>),
 
-    #[error(display = "Invalid header value")]
+    #[error("Invalid header value")]
     InvalidHeaderError,
 
-    #[error(display = "HTTP error")]
-    HttpError(#[error(source)] Arc<http::Error>),
+    #[error("HTTP error")]
+    HttpError(#[from] Arc<http::Error>),
 
-    #[error(display = "Request timed out")]
+    #[error("Request timed out")]
     TimeoutError,
 
-    #[error(display = "Failed to deserialize data")]
-    DeserializeError(#[error(source)] Arc<serde_json::Error>),
+    #[error("Failed to deserialize data")]
+    DeserializeError(#[from] Arc<serde_json::Error>),
 
     /// Unexpected response code
-    #[error(display = "Unexpected response status code {} - {}", _0, _1)]
+    #[error("Unexpected response status code {0} - {1}")]
     ApiError(StatusCode, String),
 
     /// The string given was not a valid URI.
-    #[error(display = "Not a valid URI")]
+    #[error("Not a valid URI")]
     InvalidUri,
 
-    #[error(display = "Set account token on factory with no access token store")]
+    #[error("Set account token on factory with no access token store")]
     NoAccessTokenStore,
 }
 

mullvad-api/src/rest.rs

@@ -18,7 +18,7 @@ path = "src/main.rs"
 anyhow = "1.0"
 chrono = { workspace = true }
 clap = { workspace = true }
-err-derive = { workspace = true }
+thiserror = { workspace = true }
 futures = "0.3"
 itertools = "0.10"
 natord = "1.0.9"

mullvad-cli/Cargo.toml

@@ -5,10 +5,10 @@ use talpid_types::net::{
     Endpoint, TransportProtocol,
 };
 
-#[derive(err_derive::Error, Debug)]
+#[derive(thiserror::Error, Debug)]
 pub enum Error {
-    #[error(display = "{}", _0)]
-    InvalidAuth(#[error(source)] talpid_types::net::proxy::Error),
+    #[error("{0}")]
+    InvalidAuth(#[from] talpid_types::net::proxy::Error),
 }
 
 #[derive(Args, Debug, Clone)]

mullvad-cli/src/cmds/proxies.rs

@@ -16,7 +16,7 @@ api-override = ["mullvad-api/api-override"]
 
 [dependencies]
 chrono = { workspace = true }
-err-derive = { workspace = true }
+thiserror = { workspace = true }
 fern = { version = "0.6", features = ["colored"] }
 futures = "0.3"
 once_cell = { workspace = true }

mullvad-daemon/Cargo.toml

@@ -5,27 +5,27 @@ use mullvad_types::{
     settings::Settings,
 };
 
-#[derive(err_derive::Error, Debug)]
+#[derive(thiserror::Error, Debug)]
 pub enum Error {
     /// Can not add access method
-    #[error(display = "Cannot add custom access method")]
+    #[error("Cannot add custom access method")]
     Add,
     /// Can not find access method
-    #[error(display = "Cannot find custom access method {}", _0)]
+    #[error("Cannot find custom access method {0}")]
     NoSuchMethod(access_method::Id),
     /// Some error occured in the daemon's state of handling
     /// [`AccessMethodSetting`]s & [`ApiConnectionMode`]s
-    #[error(display = "Error occured when handling connection settings & details")]
-    ApiService(#[error(source)] api::Error),
+    #[error("Error occured when handling connection settings & details")]
+    ApiService(#[from] api::Error),
     /// A REST request failed
-    #[error(display = "Reset request failed")]
-    Rest(#[error(source)] rest::Error),
+    #[error("Reset request failed")]
+    Rest(#[from] rest::Error),
     /// Something went wrong in the [`access_method`](mod@access_method) module.
-    #[error(display = "Access method error")]
-    AccessMethod(#[error(source)] access_method::Error),
+    #[error("Access method error")]
+    AccessMethod(#[from] access_method::Error),
     /// Access methods settings error
-    #[error(display = "Settings error")]
-    Settings(#[error(source)] settings::Error),
+    #[error("Settings error")]
+    Settings(#[from] settings::Error),
 }
 
 impl<L> Daemon<L>

mullvad-daemon/src/access_method.rs

@@ -10,20 +10,19 @@ use tokio::{
 
 pub type Result<T> = std::result::Result<T, Error>;
 
-#[derive(err_derive::Error, Debug)]
-#[error(no_from)]
+#[derive(thiserror::Error, Debug)]
 pub enum Error {
-    #[error(display = "Unable to open or read account history file")]
-    Read(#[error(source)] io::Error),
+    #[error("Unable to open or read account history file")]
+    Read(#[source] io::Error),
 
-    #[error(display = "Failed to serialize account history")]
-    Serialize(#[error(source)] serde_json::Error),
+    #[error("Failed to serialize account history")]
+    Serialize(#[source] serde_json::Error),
 
-    #[error(display = "Unable to write account history file")]
-    Write(#[error(source)] io::Error),
+    #[error("Unable to write account history file")]
+    Write(#[source] io::Error),
 
-    #[error(display = "Write task panicked or was cancelled")]
-    WriteCancelled(#[error(source)] tokio::task::JoinError),
+    #[error("Write task panicked or was cancelled")]
+    WriteCancelled(#[source] tokio::task::JoinError),
 }
 
 static ACCOUNT_HISTORY_FILE: &str = "account-history.json";

mullvad-daemon/src/account_history.rs

@@ -97,16 +97,16 @@ pub struct ResolvedConnectionMode {
 
 /// Describes all the ways the daemon service which handles access methods can
 /// fail.
-#[derive(err_derive::Error, Debug)]
+#[derive(thiserror::Error, Debug)]
 pub enum Error {
-    #[error(display = "No access methods were provided.")]
+    #[error("No access methods were provided.")]
     NoAccessMethods,
-    #[error(display = "AccessModeSelector is not receiving any messages.")]
-    SendFailed(#[error(source)] mpsc::TrySendError<Message>),
-    #[error(display = "AccessModeSelector is not receiving any messages.")]
+    #[error("AccessModeSelector is not receiving any messages.")]
+    SendFailed(#[from] mpsc::TrySendError<Message>),
+    #[error("AccessModeSelector is not receiving any messages.")]
     OneshotSendFailed,
-    #[error(display = "AccessModeSelector is not responding.")]
-    NotRunning(#[error(source)] oneshot::Canceled),
+    #[error("AccessModeSelector is not responding.")]
+    NotRunning(#[from] oneshot::Canceled),
 }
 
 impl std::fmt::Display for Message {