Merge branch 'rename-backend-binary'

3 files changed, 2 insertions, 16 deletions

diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 3e7e52970e..dd52e758e7 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -6,18 +6,6 @@ description = "Mullvad VPN backend daemon. Runs and controls the VPN tunnels."
 license = "GPL-3.0"
 build = "build.rs"
 
-[[bin]]
-name = "mullvadd"
-path = "src/main.rs"
-
-[[bin]]
-name = "problem-report"
-path = "src/bin/problem-report.rs"
-
-[[bin]]
-name = "list-relays"
-path = "src/bin/list-relays.rs"
-
 [dependencies]
 app_dirs = "1.1"
 chrono = { version = "0.4", features = ["serde"] }
diff --git a/mullvad-daemon/src/cli.rs b/mullvad-daemon/src/cli.rs
index d3350ad90f..b4f7506692 100644
--- a/mullvad-daemon/src/cli.rs
+++ b/mullvad-daemon/src/cli.rs
@@ -29,7 +29,7 @@ pub fn get_config() -> Config {
 }
 
 fn create_app() -> App<'static, 'static> {
-    App::new(::CRATE_NAME)
+    App::new(crate_name!())
         .version(crate_version!())
         .author(crate_authors!())
         .about(crate_description!())
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index f059b07379..2adcb0a9b7 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -113,10 +113,8 @@ lazy_static! {
     static ref RELAY_CACHE_UPDATE_TIMEOUT: Duration = Duration::from_millis(3000);
 }
 
-const CRATE_NAME: &str = "mullvadd";
-
 static APP_INFO: AppInfo = AppInfo {
-    name: CRATE_NAME,
+    name: crate_name!(),
     author: "Mullvad",
 };