summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-09-04 09:02:17 +0200
committerLinus Färnstrand <linus@mullvad.net>2018-09-04 09:02:17 +0200
commit5946412a0538679d20500cc4b2aedc4de6fea817 (patch)
tree8f78279f81fbc079c002ed8e687d7f5adf680d9b
parent4bcb0e91cb76242e8bbc104378814cd59cb8306d (diff)
parent2e2766b15fe853411bab0c3cff3506d4ec912371 (diff)
downloadmullvadvpn-5946412a0538679d20500cc4b2aedc4de6fea817.tar.xz
mullvadvpn-5946412a0538679d20500cc4b2aedc4de6fea817.zip
Merge branch 'remove-rpc-address-remains'
-rw-r--r--mullvad-ipc-client/src/lib.rs3
-rw-r--r--mullvad-paths/src/lib.rs4
-rw-r--r--mullvad-paths/src/rpc_socket.rs (renamed from mullvad-paths/src/rpc_address.rs)0
-rw-r--r--mullvad-tests/src/lib.rs4
4 files changed, 2 insertions, 9 deletions
diff --git a/mullvad-ipc-client/src/lib.rs b/mullvad-ipc-client/src/lib.rs
index 79c73fd18a..ea268c7e55 100644
--- a/mullvad-ipc-client/src/lib.rs
+++ b/mullvad-ipc-client/src/lib.rs
@@ -66,9 +66,6 @@ error_chain! {
description("Failed to setup a transport")
}
}
- links {
- UnknownRpcAddressPath(mullvad_paths::Error, mullvad_paths::ErrorKind);
- }
}
static NO_ARGS: [u8; 0] = [];
diff --git a/mullvad-paths/src/lib.rs b/mullvad-paths/src/lib.rs
index d05923c03a..96a4225f90 100644
--- a/mullvad-paths/src/lib.rs
+++ b/mullvad-paths/src/lib.rs
@@ -51,8 +51,8 @@ pub use logs::{get_log_dir, log_dir};
pub mod resources;
pub use resources::get_resource_dir;
-mod rpc_address;
-pub use rpc_address::get_rpc_socket_path;
+mod rpc_socket;
+pub use rpc_socket::get_rpc_socket_path;
mod settings;
pub use settings::settings_dir;
diff --git a/mullvad-paths/src/rpc_address.rs b/mullvad-paths/src/rpc_socket.rs
index f71e7a4edd..f71e7a4edd 100644
--- a/mullvad-paths/src/rpc_address.rs
+++ b/mullvad-paths/src/rpc_socket.rs
diff --git a/mullvad-tests/src/lib.rs b/mullvad-tests/src/lib.rs
index b90aaa3157..30c602ee70 100644
--- a/mullvad-tests/src/lib.rs
+++ b/mullvad-tests/src/lib.rs
@@ -274,10 +274,6 @@ pub struct DaemonRunner {
}
impl DaemonRunner {
- pub fn spawn_with_real_rpc_address_file() -> Self {
- Self::spawn_internal()
- }
-
pub fn spawn() -> Self {
Self::spawn_internal()
}