diff options
| author | Joakim Hulthe <joakim@hulthe.net> | 2024-02-26 14:24:15 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2024-02-27 10:38:19 +0100 |
| commit | a6d3578d256349ffe74b7c6a7a80ac2d70b7f68e (patch) | |
| tree | 92d6bfab07a4d7d8d88fce7680ffd8278c37d4ce /test/test-runner | |
| parent | 0a4915b113263f8353663e4fc07297d2862f2bc0 (diff) | |
| download | mullvadvpn-a6d3578d256349ffe74b7c6a7a80ac2d70b7f68e.tar.xz mullvadvpn-a6d3578d256349ffe74b7c6a7a80ac2d70b7f68e.zip | |
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.
Diffstat (limited to 'test/test-runner')
| -rw-r--r-- | test/test-runner/Cargo.toml | 2 | ||||
| -rw-r--r-- | test/test-runner/src/main.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/test-runner/Cargo.toml b/test/test-runner/Cargo.toml index 1a0163213f..dbe57c938e 100644 --- a/test/test-runner/Cargo.toml +++ b/test/test-runner/Cargo.toml @@ -15,7 +15,7 @@ futures = { workspace = true } tarpc = { workspace = true } tokio = { workspace = true } tokio-serial = { workspace = true } -err-derive = { workspace = true } +thiserror = { workspace = true } log = { workspace = true } once_cell = { workspace = true } parity-tokio-ipc = "0.9" diff --git a/test/test-runner/src/main.rs b/test/test-runner/src/main.rs index 74f7761cc2..befeeb61e0 100644 --- a/test/test-runner/src/main.rs +++ b/test/test-runner/src/main.rs @@ -325,9 +325,9 @@ fn get_pipe_status() -> ServiceStatus { /// Keep this constant in sync with `test-manager/src/run_tests.rs` const BAUD: u32 = if cfg!(target_os = "macos") { 0 } else { 115200 }; -#[derive(err_derive::Error, Debug)] +#[derive(thiserror::Error, Debug)] pub enum Error { - #[error(display = "Unknown RPC")] + #[error("Unknown RPC")] UnknownRpc, } |
