diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-04-05 15:20:22 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-04-05 16:28:05 +0200 |
| commit | 26df46b88d78d2731d2cf5d53d698496fadb2f3e (patch) | |
| tree | ff7f7d88857d07b256274b5215c62d2c8fcdec8c | |
| parent | 7cacecc0056607f4872377137ba00965348179c1 (diff) | |
| download | mullvadvpn-26df46b88d78d2731d2cf5d53d698496fadb2f3e.tar.xz mullvadvpn-26df46b88d78d2731d2cf5d53d698496fadb2f3e.zip | |
Remove error-chain dep from talpid-core
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | talpid-core/Cargo.toml | 1 | ||||
| -rw-r--r-- | talpid-core/src/firewall/linux.rs | 2 | ||||
| -rw-r--r-- | talpid-core/src/lib.rs | 3 |
4 files changed, 1 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index a447c280d1..24e9f28f7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1984,7 +1984,6 @@ dependencies = [ "derive_more 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "duct 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "err-derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml index b27c509fcb..5c0e57e557 100644 --- a/talpid-core/Cargo.toml +++ b/talpid-core/Cargo.toml @@ -10,7 +10,6 @@ edition = "2018" atty = "0.2" derive_more = "0.14" duct = "0.12" -error-chain = "0.12" err-derive = "0.1.5" futures = "0.1" jsonrpc-core = { git = "https://github.com/mullvad/jsonrpc", branch = "mullvad-fork" } diff --git a/talpid-core/src/firewall/linux.rs b/talpid-core/src/firewall/linux.rs index 5c8d9e777e..540bdff1ee 100644 --- a/talpid-core/src/firewall/linux.rs +++ b/talpid-core/src/firewall/linux.rs @@ -164,7 +164,7 @@ impl Firewall { "Expected '{}' netfilter table to be set, but it is not", expected_table.to_string_lossy() ); - bail!(Error::NetfilterTableNotSetError) + return Err(Error::NetfilterTableNotSetError); } } Ok(()) diff --git a/talpid-core/src/lib.rs b/talpid-core/src/lib.rs index 1499557439..3b2bac9529 100644 --- a/talpid-core/src/lib.rs +++ b/talpid-core/src/lib.rs @@ -11,9 +11,6 @@ //! GNU General Public License as published by the Free Software Foundation, either version 3 of //! the License, or (at your option) any later version. -#[macro_use] -extern crate error_chain; - /// Misc FFI utilities. #[cfg(windows)] #[macro_use] |