diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-04-05 14:47:52 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-04-05 16:28:05 +0200 |
| commit | 686ae61bc224c0fc62f7087df4a343dcaebf6664 (patch) | |
| tree | 65be1bdf82c4bba7095a0fbbb23e7d59628f3f51 | |
| parent | 464b37f5bf3e3a1bdba1a8e52d52c5f6f6e30c92 (diff) | |
| download | mullvadvpn-686ae61bc224c0fc62f7087df4a343dcaebf6664.tar.xz mullvadvpn-686ae61bc224c0fc62f7087df4a343dcaebf6664.zip | |
Eliminate error-chain in android routing
| -rw-r--r-- | talpid-core/src/routing/android.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/talpid-core/src/routing/android.rs b/talpid-core/src/routing/android.rs index fa5c5c8f8e..5c562537f1 100644 --- a/talpid-core/src/routing/android.rs +++ b/talpid-core/src/routing/android.rs @@ -7,7 +7,10 @@ use std::{ net::{IpAddr, Ipv4Addr}, }; -error_chain! {} +/// Stub error type for routing errors on Android. +#[derive(Debug, err_derive::Error)] +#[error(display = "Unknown Android routing error")] +pub struct Error; pub struct RouteManager; @@ -18,15 +21,15 @@ impl super::RoutingT for RouteManager { Ok(RouteManager) } - fn add_routes(&mut self, _required_routes: RequiredRoutes) -> Result<()> { + fn add_routes(&mut self, _required_routes: RequiredRoutes) -> Result<(), Self::Error> { Ok(()) } - fn delete_routes(&mut self) -> Result<()> { + fn delete_routes(&mut self) -> Result<(), Self::Error> { Ok(()) } - fn get_default_route_node(&mut self) -> Result<IpAddr> { + fn get_default_route_node(&mut self) -> Result<IpAddr, Self::Error> { Ok(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0))) } } |
