diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-07-17 10:36:52 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-07-17 10:48:09 +0200 |
| commit | f07f1a0262c908ff83490850b67a167f963efc2d (patch) | |
| tree | 5a5209baefc0b10ba528f254e7ce2456c23f6ac9 | |
| parent | 6a4202fc8c55752f0fef86c04b628a3f9ada5279 (diff) | |
| download | mullvadvpn-f07f1a0262c908ff83490850b67a167f963efc2d.tar.xz mullvadvpn-f07f1a0262c908ff83490850b67a167f963efc2d.zip | |
Rename all crates from snake_case to kebab-case
| -rw-r--r-- | Cargo.lock | 32 | ||||
| -rw-r--r-- | Cargo.toml | 14 | ||||
| -rw-r--r-- | mullvad-cli/Cargo.toml (renamed from mullvad_cli/Cargo.toml) | 6 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/account.rs (renamed from mullvad_cli/src/cmds/account.rs) | 0 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/connect.rs (renamed from mullvad_cli/src/cmds/connect.rs) | 0 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/disconnect.rs (renamed from mullvad_cli/src/cmds/disconnect.rs) | 0 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/mod.rs (renamed from mullvad_cli/src/cmds/mod.rs) | 0 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/status.rs (renamed from mullvad_cli/src/cmds/status.rs) | 0 | ||||
| -rw-r--r-- | mullvad-cli/src/main.rs (renamed from mullvad_cli/src/main.rs) | 0 | ||||
| -rw-r--r-- | mullvad-cli/src/rpc.rs (renamed from mullvad_cli/src/rpc.rs) | 0 | ||||
| -rw-r--r-- | mullvad-daemon/Cargo.toml (renamed from mullvad_daemon/Cargo.toml) | 8 | ||||
| -rw-r--r-- | mullvad-daemon/src/cli.rs (renamed from mullvad_daemon/src/cli.rs) | 0 | ||||
| -rw-r--r-- | mullvad-daemon/src/main.rs (renamed from mullvad_daemon/src/main.rs) | 0 | ||||
| -rw-r--r-- | mullvad-daemon/src/management_interface.rs (renamed from mullvad_daemon/src/management_interface.rs) | 0 | ||||
| -rw-r--r-- | mullvad-daemon/src/mock_ipc.rs (renamed from mullvad_daemon/src/mock_ipc.rs) | 0 | ||||
| -rw-r--r-- | mullvad-daemon/src/rpc_info.rs (renamed from mullvad_daemon/src/rpc_info.rs) | 0 | ||||
| -rw-r--r-- | mullvad-daemon/src/shutdown.rs (renamed from mullvad_daemon/src/shutdown.rs) | 0 | ||||
| -rw-r--r-- | mullvad-types/Cargo.toml (renamed from mullvad_types/Cargo.toml) | 2 | ||||
| -rw-r--r-- | mullvad-types/src/lib.rs (renamed from mullvad_types/src/lib.rs) | 0 | ||||
| -rw-r--r-- | mullvad-types/src/states.rs (renamed from mullvad_types/src/states.rs) | 0 | ||||
| -rw-r--r-- | openvpn-ffi/Cargo.toml (renamed from openvpn_ffi/Cargo.toml) | 2 | ||||
| -rw-r--r-- | openvpn-ffi/src/lib.rs (renamed from openvpn_ffi/src/lib.rs) | 0 | ||||
| -rw-r--r-- | openvpn-ffi/src/parse.rs (renamed from openvpn_ffi/src/parse.rs) | 0 | ||||
| -rw-r--r-- | openvpn-ffi/src/structs.rs (renamed from openvpn_ffi/src/structs.rs) | 0 | ||||
| -rw-r--r-- | talpid-core/Cargo.toml (renamed from talpid_core/Cargo.toml) | 17 | ||||
| -rw-r--r-- | talpid-core/src/lib.rs (renamed from talpid_core/src/lib.rs) | 0 | ||||
| -rw-r--r-- | talpid-core/src/mpsc.rs (renamed from talpid_core/src/mpsc.rs) | 0 | ||||
| -rw-r--r-- | talpid-core/src/net.rs (renamed from talpid_core/src/net.rs) | 0 | ||||
| -rw-r--r-- | talpid-core/src/process/mod.rs (renamed from talpid_core/src/process/mod.rs) | 0 | ||||
| -rw-r--r-- | talpid-core/src/process/openvpn.rs (renamed from talpid_core/src/process/openvpn.rs) | 0 | ||||
| -rw-r--r-- | talpid-core/src/process/unix.rs (renamed from talpid_core/src/process/unix.rs) | 0 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/mod.rs (renamed from talpid_core/src/tunnel/mod.rs) | 0 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/openvpn.rs (renamed from talpid_core/src/tunnel/openvpn.rs) | 0 | ||||
| -rw-r--r-- | talpid-ipc/Cargo.toml (renamed from talpid_ipc/Cargo.toml) | 2 | ||||
| -rw-r--r-- | talpid-ipc/src/client.rs (renamed from talpid_ipc/src/client.rs) | 0 | ||||
| -rw-r--r-- | talpid-ipc/src/lib.rs (renamed from talpid_ipc/src/lib.rs) | 0 | ||||
| -rw-r--r-- | talpid-ipc/tests/ipc-client-server.rs (renamed from talpid_ipc/tests/ipc-client-server.rs) | 0 | ||||
| -rw-r--r-- | talpid-openvpn-plugin/Cargo.toml (renamed from talpid_openvpn_plugin/Cargo.toml) | 9 | ||||
| -rw-r--r-- | talpid-openvpn-plugin/src/lib.rs (renamed from talpid_openvpn_plugin/src/lib.rs) | 0 | ||||
| -rw-r--r-- | talpid-openvpn-plugin/src/processing.rs (renamed from talpid_openvpn_plugin/src/processing.rs) | 0 |
40 files changed, 43 insertions, 49 deletions
diff --git a/Cargo.lock b/Cargo.lock index 4b51fe51a2..55c97f35ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,12 +1,12 @@ [root] -name = "talpid_openvpn_plugin" +name = "talpid-openvpn-plugin" version = "0.1.0" dependencies = [ "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "openvpn_ffi 0.1.0", - "talpid_ipc 0.1.0", + "openvpn-ffi 0.1.0", + "talpid-ipc 0.1.0", ] [[package]] @@ -376,21 +376,21 @@ dependencies = [ ] [[package]] -name = "mullvad_cli" +name = "mullvad-cli" version = "0.1.0" dependencies = [ "clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mullvad_types 0.1.0", + "mullvad-types 0.1.0", "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "talpid_ipc 0.1.0", + "talpid-ipc 0.1.0", ] [[package]] -name = "mullvad_daemon" +name = "mullvad-daemon" version = "0.1.0" dependencies = [ "assert_matches 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -405,17 +405,17 @@ dependencies = [ "jsonrpc-ws-server 7.0.1 (git+https://github.com/paritytech/jsonrpc)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mullvad_types 0.1.0", + "mullvad-types 0.1.0", "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "simple-signal 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "talpid_core 0.1.0", - "talpid_ipc 0.1.0", + "talpid-core 0.1.0", + "talpid-ipc 0.1.0", "uuid 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "mullvad_types" +name = "mullvad-types" version = "0.1.0" dependencies = [ "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -478,7 +478,7 @@ version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "openvpn_ffi" +name = "openvpn-ffi" version = "0.1.0" dependencies = [ "assert_matches 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -680,7 +680,7 @@ dependencies = [ ] [[package]] -name = "talpid_core" +name = "talpid-core" version = "0.1.0" dependencies = [ "assert_matches 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -692,12 +692,12 @@ dependencies = [ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "mktemp 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "openvpn_ffi 0.1.0", - "talpid_ipc 0.1.0", + "openvpn-ffi 0.1.0", + "talpid-ipc 0.1.0", ] [[package]] -name = "talpid_ipc" +name = "talpid-ipc" version = "0.1.0" dependencies = [ "assert_matches 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 00105baebc..7c598c504c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,10 @@ [workspace] members = [ - "mullvad_daemon", - "mullvad_cli", - "mullvad_types", - "talpid_openvpn_plugin", - "talpid_core", - "talpid_ipc", - "openvpn_ffi", + "mullvad-daemon", + "mullvad-cli", + "mullvad-types", + "talpid-openvpn-plugin", + "talpid-core", + "talpid-ipc", + "openvpn-ffi", ] diff --git a/mullvad_cli/Cargo.toml b/mullvad-cli/Cargo.toml index dceaf6b12a..83bcb95b5e 100644 --- a/mullvad_cli/Cargo.toml +++ b/mullvad-cli/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "mullvad_cli" +name = "mullvad-cli" version = "0.1.0" authors = ["Linus Färnstrand <linus@mullvad.net>", "Erik Larkö <erik@mullvad.net>"] description = "Run Talpid easily from the command line" @@ -15,5 +15,5 @@ env_logger = "0.4" serde = "1.0" serde_json = "1.0" -mullvad_types = { path = "../mullvad_types" } -talpid_ipc = { path = "../talpid_ipc" } +mullvad-types = { path = "../mullvad-types" } +talpid-ipc = { path = "../talpid-ipc" } diff --git a/mullvad_cli/src/cmds/account.rs b/mullvad-cli/src/cmds/account.rs index fcfe9f9901..fcfe9f9901 100644 --- a/mullvad_cli/src/cmds/account.rs +++ b/mullvad-cli/src/cmds/account.rs diff --git a/mullvad_cli/src/cmds/connect.rs b/mullvad-cli/src/cmds/connect.rs index 4847a0805a..4847a0805a 100644 --- a/mullvad_cli/src/cmds/connect.rs +++ b/mullvad-cli/src/cmds/connect.rs diff --git a/mullvad_cli/src/cmds/disconnect.rs b/mullvad-cli/src/cmds/disconnect.rs index 543aa9d0cc..543aa9d0cc 100644 --- a/mullvad_cli/src/cmds/disconnect.rs +++ b/mullvad-cli/src/cmds/disconnect.rs diff --git a/mullvad_cli/src/cmds/mod.rs b/mullvad-cli/src/cmds/mod.rs index c621c0840a..c621c0840a 100644 --- a/mullvad_cli/src/cmds/mod.rs +++ b/mullvad-cli/src/cmds/mod.rs diff --git a/mullvad_cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs index e02773285f..e02773285f 100644 --- a/mullvad_cli/src/cmds/status.rs +++ b/mullvad-cli/src/cmds/status.rs diff --git a/mullvad_cli/src/main.rs b/mullvad-cli/src/main.rs index 08d5459dd7..08d5459dd7 100644 --- a/mullvad_cli/src/main.rs +++ b/mullvad-cli/src/main.rs diff --git a/mullvad_cli/src/rpc.rs b/mullvad-cli/src/rpc.rs index 7397e822c4..7397e822c4 100644 --- a/mullvad_cli/src/rpc.rs +++ b/mullvad-cli/src/rpc.rs diff --git a/mullvad_daemon/Cargo.toml b/mullvad-daemon/Cargo.toml index c5ddc653a2..e70e03280c 100644 --- a/mullvad_daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "mullvad_daemon" +name = "mullvad-daemon" version = "0.1.0" authors = ["Linus Färnstrand <linus@mullvad.net>", "Erik Larkö <erik@mullvad.net>"] description = "Mullvad VPN backend daemon. Runs and controls the VPN tunnels." @@ -22,9 +22,9 @@ jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc" } uuid = { version = "0.5", features = ["v4"] } lazy_static = "0.2" -mullvad_types = { path = "../mullvad_types" } -talpid_core = { path = "../talpid_core" } -talpid_ipc = { path = "../talpid_ipc" } +mullvad-types = { path = "../mullvad-types" } +talpid-core = { path = "../talpid-core" } +talpid-ipc = { path = "../talpid-ipc" } [target.'cfg(unix)'.dependencies] simple-signal = "1.1" diff --git a/mullvad_daemon/src/cli.rs b/mullvad-daemon/src/cli.rs index 670a2bf28b..670a2bf28b 100644 --- a/mullvad_daemon/src/cli.rs +++ b/mullvad-daemon/src/cli.rs diff --git a/mullvad_daemon/src/main.rs b/mullvad-daemon/src/main.rs index b26ca315a8..b26ca315a8 100644 --- a/mullvad_daemon/src/main.rs +++ b/mullvad-daemon/src/main.rs diff --git a/mullvad_daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs index ffba3dca0f..ffba3dca0f 100644 --- a/mullvad_daemon/src/management_interface.rs +++ b/mullvad-daemon/src/management_interface.rs diff --git a/mullvad_daemon/src/mock_ipc.rs b/mullvad-daemon/src/mock_ipc.rs index 90859401c2..90859401c2 100644 --- a/mullvad_daemon/src/mock_ipc.rs +++ b/mullvad-daemon/src/mock_ipc.rs diff --git a/mullvad_daemon/src/rpc_info.rs b/mullvad-daemon/src/rpc_info.rs index 25078ff899..25078ff899 100644 --- a/mullvad_daemon/src/rpc_info.rs +++ b/mullvad-daemon/src/rpc_info.rs diff --git a/mullvad_daemon/src/shutdown.rs b/mullvad-daemon/src/shutdown.rs index 4da73c4d05..4da73c4d05 100644 --- a/mullvad_daemon/src/shutdown.rs +++ b/mullvad-daemon/src/shutdown.rs diff --git a/mullvad_types/Cargo.toml b/mullvad-types/Cargo.toml index 0485cd1bc2..9f5e3a4202 100644 --- a/mullvad_types/Cargo.toml +++ b/mullvad-types/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "mullvad_types" +name = "mullvad-types" version = "0.1.0" authors = ["Linus Färnstrand <linus@mullvad.net>"] diff --git a/mullvad_types/src/lib.rs b/mullvad-types/src/lib.rs index 602a43cb29..602a43cb29 100644 --- a/mullvad_types/src/lib.rs +++ b/mullvad-types/src/lib.rs diff --git a/mullvad_types/src/states.rs b/mullvad-types/src/states.rs index e40ab94b0b..e40ab94b0b 100644 --- a/mullvad_types/src/states.rs +++ b/mullvad-types/src/states.rs diff --git a/openvpn_ffi/Cargo.toml b/openvpn-ffi/Cargo.toml index 062bf1f063..fd739707f0 100644 --- a/openvpn_ffi/Cargo.toml +++ b/openvpn-ffi/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "openvpn_ffi" +name = "openvpn-ffi" version = "0.1.0" authors = ["Linus Färnstrand <linus@mullvad.net>", "Erik Larkö <erik@mullvad.net>"] description = "Constants, enums and structs for interfacing with OpenVPN" diff --git a/openvpn_ffi/src/lib.rs b/openvpn-ffi/src/lib.rs index 934eb091df..934eb091df 100644 --- a/openvpn_ffi/src/lib.rs +++ b/openvpn-ffi/src/lib.rs diff --git a/openvpn_ffi/src/parse.rs b/openvpn-ffi/src/parse.rs index 6d0c42c06f..6d0c42c06f 100644 --- a/openvpn_ffi/src/parse.rs +++ b/openvpn-ffi/src/parse.rs diff --git a/openvpn_ffi/src/structs.rs b/openvpn-ffi/src/structs.rs index b80f7ae2a2..b80f7ae2a2 100644 --- a/openvpn_ffi/src/structs.rs +++ b/openvpn-ffi/src/structs.rs diff --git a/talpid_core/Cargo.toml b/talpid-core/Cargo.toml index 64db057ecc..2be5457e26 100644 --- a/talpid_core/Cargo.toml +++ b/talpid-core/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "talpid_core" +name = "talpid-core" version = "0.1.0" authors = ["Linus Färnstrand <linus@mullvad.net>", "Erik Larkö <erik@mullvad.net>"] description = "Core backend functionality of the Mullvad VPN client" @@ -7,20 +7,17 @@ description = "Core backend functionality of the Mullvad VPN client" [dependencies] duct = "0.9.1" error-chain = "0.10" -log = "0.3" -lazy_static = "0.2" -mktemp = "0.3" jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc" } jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc" } +lazy_static = "0.2" +log = "0.3" +mktemp = "0.3" + +openvpn-ffi = { path = "../openvpn-ffi" } +talpid-ipc = { path = "../talpid-ipc" } [target.'cfg(unix)'.dependencies] libc = "0.2.20" -[dependencies.talpid_ipc] -path = "../talpid_ipc" - -[dependencies.openvpn_ffi] -path = "../openvpn_ffi" - [dev-dependencies] assert_matches = "1.0" diff --git a/talpid_core/src/lib.rs b/talpid-core/src/lib.rs index 1fc92f8fe4..1fc92f8fe4 100644 --- a/talpid_core/src/lib.rs +++ b/talpid-core/src/lib.rs diff --git a/talpid_core/src/mpsc.rs b/talpid-core/src/mpsc.rs index d63956c452..d63956c452 100644 --- a/talpid_core/src/mpsc.rs +++ b/talpid-core/src/mpsc.rs diff --git a/talpid_core/src/net.rs b/talpid-core/src/net.rs index 310adee6ca..310adee6ca 100644 --- a/talpid_core/src/net.rs +++ b/talpid-core/src/net.rs diff --git a/talpid_core/src/process/mod.rs b/talpid-core/src/process/mod.rs index 88bdc12ea4..88bdc12ea4 100644 --- a/talpid_core/src/process/mod.rs +++ b/talpid-core/src/process/mod.rs diff --git a/talpid_core/src/process/openvpn.rs b/talpid-core/src/process/openvpn.rs index ea66ef894c..ea66ef894c 100644 --- a/talpid_core/src/process/openvpn.rs +++ b/talpid-core/src/process/openvpn.rs diff --git a/talpid_core/src/process/unix.rs b/talpid-core/src/process/unix.rs index 64599a6930..64599a6930 100644 --- a/talpid_core/src/process/unix.rs +++ b/talpid-core/src/process/unix.rs diff --git a/talpid_core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs index b05f1283f3..b05f1283f3 100644 --- a/talpid_core/src/tunnel/mod.rs +++ b/talpid-core/src/tunnel/mod.rs diff --git a/talpid_core/src/tunnel/openvpn.rs b/talpid-core/src/tunnel/openvpn.rs index 08c2c14a32..08c2c14a32 100644 --- a/talpid_core/src/tunnel/openvpn.rs +++ b/talpid-core/src/tunnel/openvpn.rs diff --git a/talpid_ipc/Cargo.toml b/talpid-ipc/Cargo.toml index 5d2a99233d..45adefa6a7 100644 --- a/talpid_ipc/Cargo.toml +++ b/talpid-ipc/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "talpid_ipc" +name = "talpid-ipc" version = "0.1.0" authors = ["Linus Färnstrand <linus@mullvad.net>", "Erik Larkö <erik@mullvad.net>"] description = "IPC client and server for talpid" diff --git a/talpid_ipc/src/client.rs b/talpid-ipc/src/client.rs index 5d63db24f9..5d63db24f9 100644 --- a/talpid_ipc/src/client.rs +++ b/talpid-ipc/src/client.rs diff --git a/talpid_ipc/src/lib.rs b/talpid-ipc/src/lib.rs index 3ef9bf4733..3ef9bf4733 100644 --- a/talpid_ipc/src/lib.rs +++ b/talpid-ipc/src/lib.rs diff --git a/talpid_ipc/tests/ipc-client-server.rs b/talpid-ipc/tests/ipc-client-server.rs index 654eff4dcc..654eff4dcc 100644 --- a/talpid_ipc/tests/ipc-client-server.rs +++ b/talpid-ipc/tests/ipc-client-server.rs diff --git a/talpid_openvpn_plugin/Cargo.toml b/talpid-openvpn-plugin/Cargo.toml index e0a511953b..c2ae39430c 100644 --- a/talpid_openvpn_plugin/Cargo.toml +++ b/talpid-openvpn-plugin/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "talpid_openvpn_plugin" +name = "talpid-openvpn-plugin" version = "0.1.0" authors = ["Linus Färnstrand <linus@mullvad.net>", "Erik Larkö <erik@mullvad.net>"] description = "OpenVPN shared library plugin for relaying OpenVPN events to talpid_core" @@ -12,8 +12,5 @@ error-chain = "0.10" log = "0.3" env_logger = "0.4" -[dependencies.talpid_ipc] -path = "../talpid_ipc" - -[dependencies.openvpn_ffi] -path = "../openvpn_ffi" +talpid-ipc = { path = "../talpid-ipc" } +openvpn-ffi = { path = "../openvpn-ffi" } diff --git a/talpid_openvpn_plugin/src/lib.rs b/talpid-openvpn-plugin/src/lib.rs index 55102d111c..55102d111c 100644 --- a/talpid_openvpn_plugin/src/lib.rs +++ b/talpid-openvpn-plugin/src/lib.rs diff --git a/talpid_openvpn_plugin/src/processing.rs b/talpid-openvpn-plugin/src/processing.rs index e33097c633..e33097c633 100644 --- a/talpid_openvpn_plugin/src/processing.rs +++ b/talpid-openvpn-plugin/src/processing.rs |
