Merge branch 'improve-rust-crate-versioning'

2 files changed, 3 insertions, 4 deletions

diff --git a/mullvad-cli/src/cmds/beta_program.rs b/mullvad-cli/src/cmds/beta_program.rs
index 8f659ec9b9..3fdcdb30f4 100644
--- a/mullvad-cli/src/cmds/beta_program.rs
+++ b/mullvad-cli/src/cmds/beta_program.rs
@@ -1,4 +1,4 @@
-use crate::{new_rpc_client, Command, Error, Result, PRODUCT_VERSION};
+use crate::{new_rpc_client, Command, Error, Result};
 
 pub struct BetaProgram;
 
@@ -41,7 +41,7 @@ impl Command for BetaProgram {
                 let enable_str = matches.value_of("policy").expect("missing policy");
                 let enable = enable_str == "on";
 
-                if !enable && PRODUCT_VERSION.contains("beta") {
+                if !enable && mullvad_version::VERSION.contains("beta") {
                     return Err(Error::InvalidCommand(
                         "The beta program must be enabled while running a beta version",
                     ));
diff --git a/mullvad-cli/src/main.rs b/mullvad-cli/src/main.rs
index df7ef0a04c..39479d4054 100644
--- a/mullvad-cli/src/main.rs
+++ b/mullvad-cli/src/main.rs
@@ -15,7 +15,6 @@ mod location;
 mod state;
 
 pub const BIN_NAME: &str = "mullvad";
-pub const PRODUCT_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/product-version.txt"));
 
 pub type Result<T> = std::result::Result<T, Error>;
 
@@ -132,7 +131,7 @@ async fn run() -> Result<()> {
 
 fn build_cli(commands: &HashMap<&'static str, Box<dyn Command>>) -> clap::App<'static> {
     clap::App::new(BIN_NAME)
-        .version(PRODUCT_VERSION)
+        .version(mullvad_version::VERSION)
         .author(crate_authors!())
         .about(crate_description!())
         .setting(clap::AppSettings::SubcommandRequiredElseHelp)