fix: kill dependency const_format

cryspen · Jul 4, 2024 · e5dac02 · e5dac02
1 parent 875f0c5
commit e5dac02
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/driver/Cargo.toml b/cli/driver/Cargo.toml
@@ -27,7 +27,6 @@ hax-frontend-exporter-options.workspace = true
 hax-lib-macros-types.workspace = true
 itertools.workspace = true
 which.workspace = true
-const_format = "0.2"
 tracing.workspace = true
 tracing-subscriber.workspace = true
 tracing-tree.workspace = true
diff --git a/cli/driver/src/driver.rs b/cli/driver/src/driver.rs
@@ -36,7 +36,6 @@ mod features;
 use callbacks_wrapper::*;
 use features::*;
 
-use const_format::formatcp;
 use hax_types::cli_options::{BackendOptions, Command, ENV_VAR_OPTIONS_FRONTEND};
 
 use rustc_driver::{Callbacks, Compilation};
@@ -80,11 +79,11 @@ fn main() {
     setup_logging();
 
     let options: hax_types::cli_options::Options =
-        serde_json::from_str(&std::env::var(ENV_VAR_OPTIONS_FRONTEND).expect(&formatcp!(
+        serde_json::from_str(&std::env::var(ENV_VAR_OPTIONS_FRONTEND).expect(&format!(
             "Cannot find environnement variable {}",
             ENV_VAR_OPTIONS_FRONTEND
         )))
-        .expect(&formatcp!(
+        .expect(&format!(
             "Invalid value for the environnement variable {}",
             ENV_VAR_OPTIONS_FRONTEND
         ));

diff --git a/cli/subcommands/Cargo.toml b/cli/subcommands/Cargo.toml
@@ -37,7 +37,6 @@ colored.workspace = true
 is-terminal = "0.4.9"
 hax-phase-debug-webapp.workspace = true
 inquire = "0.6"
-const_format = "0.2"
 annotate-snippets.workspace = true
 serde-jsonlines = "0.5.0"
 prettyplease = "0.2.20"

diff --git a/cli/subcommands/src/cargo_hax.rs b/cli/subcommands/src/cargo_hax.rs
@@ -74,10 +74,7 @@ fn rustflags() -> String {
 }
 
 const ENGINE_BINARY_NAME: &str = "hax-engine";
-const ENGINE_BINARY_NOT_FOUND: &str = const_format::formatcp!(
-    "The binary [{}] was not found in your [PATH].",
-    ENGINE_BINARY_NAME,
-);
+const ENGINE_BINARY_NOT_FOUND: &str = "The binary [hax-engine] was not found in your [PATH].";
 
 /// Dynamically looks for binary [ENGINE_BINARY_NAME].  First, we
 /// check whether [HAX_ENGINE_BINARY] is set, and use that if it