diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-04-07 09:18:04 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-04-07 09:26:35 +0200 |
| commit | 30fad8d78135e72cf671d1b01ee1b1c6643ff21c (patch) | |
| tree | 64b629ff5a03c107980f983d2fe3e3b0fc4736e8 | |
| parent | 5701c32ba8ff9ab7fbc2712d813287c812bc5aef (diff) | |
| download | mullvadvpn-30fad8d78135e72cf671d1b01ee1b1c6643ff21c.tar.xz mullvadvpn-30fad8d78135e72cf671d1b01ee1b1c6643ff21c.zip | |
Move talpid_core from root to member
| -rw-r--r-- | Cargo.toml | 20 | ||||
| -rw-r--r-- | talpid_cli/Cargo.toml | 2 | ||||
| -rw-r--r-- | talpid_core/Cargo.toml | 19 | ||||
| -rw-r--r-- | talpid_core/src/lib.rs (renamed from src/lib.rs) | 0 | ||||
| -rw-r--r-- | talpid_core/src/net.rs (renamed from src/net.rs) | 0 | ||||
| -rw-r--r-- | talpid_core/src/process/mod.rs (renamed from src/process/mod.rs) | 0 | ||||
| -rw-r--r-- | talpid_core/src/process/monitor.rs (renamed from src/process/monitor.rs) | 0 | ||||
| -rw-r--r-- | talpid_core/src/process/openvpn.rs (renamed from src/process/openvpn.rs) | 0 |
8 files changed, 20 insertions, 21 deletions
diff --git a/Cargo.toml b/Cargo.toml index 64ac8efa06..dd15996b0e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,22 +1,2 @@ -[package] -name = "talpid_core" -version = "0.0.0" -authors = ["Linus Färnstrand <linus@mullvad.net>", "Erik Larkö <erik@mullvad.net>"] -description = "Core backend functionality of the Mullvad VPN client" - -[dependencies] -clonablechild = "0.1" -error-chain = "0.8" -log = "0.3" - -[dependencies.talpid_ipc] -path = "talpid_ipc" - -[dependencies.openvpn_ffi] -path = "openvpn_ffi" - -[dev-dependencies] -assert_matches = "1.0" - [workspace] members = ["talpid_daemon", "talpid_openvpn_plugin", "openvpn_ffi", "talpid_cli", "talpid_ipc"] diff --git a/talpid_cli/Cargo.toml b/talpid_cli/Cargo.toml index bc2111bb0d..e6e0cefd55 100644 --- a/talpid_cli/Cargo.toml +++ b/talpid_cli/Cargo.toml @@ -11,4 +11,4 @@ log = "0.3" env_logger = "0.4" [dependencies.talpid_core] -path = "../" +path = "../talpid_core" diff --git a/talpid_core/Cargo.toml b/talpid_core/Cargo.toml new file mode 100644 index 0000000000..057a6ee2dc --- /dev/null +++ b/talpid_core/Cargo.toml @@ -0,0 +1,19 @@ +[package] +name = "talpid_core" +version = "0.0.0" +authors = ["Linus Färnstrand <linus@mullvad.net>", "Erik Larkö <erik@mullvad.net>"] +description = "Core backend functionality of the Mullvad VPN client" + +[dependencies] +clonablechild = "0.1" +error-chain = "0.8" +log = "0.3" + +[dependencies.talpid_ipc] +path = "../talpid_ipc" + +[dependencies.openvpn_ffi] +path = "../openvpn_ffi" + +[dev-dependencies] +assert_matches = "1.0" diff --git a/src/lib.rs b/talpid_core/src/lib.rs index 8fe76a5a69..8fe76a5a69 100644 --- a/src/lib.rs +++ b/talpid_core/src/lib.rs diff --git a/src/net.rs b/talpid_core/src/net.rs index 3701ae641e..3701ae641e 100644 --- a/src/net.rs +++ b/talpid_core/src/net.rs diff --git a/src/process/mod.rs b/talpid_core/src/process/mod.rs index 3259f90524..3259f90524 100644 --- a/src/process/mod.rs +++ b/talpid_core/src/process/mod.rs diff --git a/src/process/monitor.rs b/talpid_core/src/process/monitor.rs index 3a6f9fb65f..3a6f9fb65f 100644 --- a/src/process/monitor.rs +++ b/talpid_core/src/process/monitor.rs diff --git a/src/process/openvpn.rs b/talpid_core/src/process/openvpn.rs index e002d2b9c3..e002d2b9c3 100644 --- a/src/process/openvpn.rs +++ b/talpid_core/src/process/openvpn.rs |