diff options
| author | Emmanuel Roullit <eroullit@github.com> | 2023-02-25 17:11:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-25 17:11:43 +0100 |
| commit | fcadbfc70d578e4a993711d5a7f1737aebd6b3ce (patch) | |
| tree | 897142c1904755a43aefce56695c0b8186381e69 /src/exercise.rs | |
| parent | b653d4848a52701d2240f130ab74c158dd5d7069 (diff) | |
| parent | 701b4bef51b50d1fd3bb7fbfe3cc274f2bbdcb0c (diff) | |
Merge branch 'rust-lang:main' into codespaces
Diffstat (limited to 'src/exercise.rs')
| -rw-r--r-- | src/exercise.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/exercise.rs b/src/exercise.rs index c0dae34..2cde4e1 100644 --- a/src/exercise.rs +++ b/src/exercise.rs @@ -8,6 +8,7 @@ use std::path::PathBuf; use std::process::{self, Command}; const RUSTC_COLOR_ARGS: &[&str] = &["--color", "always"]; +const RUSTC_EDITION_ARGS: &[&str] = &["--edition", "2021"]; const I_AM_DONE_REGEX: &str = r"(?m)^\s*///?\s*I\s+AM\s+NOT\s+DONE"; const CONTEXT: usize = 2; const CLIPPY_CARGO_TOML_PATH: &str = "./exercises/clippy/Cargo.toml"; @@ -111,10 +112,12 @@ impl Exercise { Mode::Compile => Command::new("rustc") .args(&[self.path.to_str().unwrap(), "-o", &temp_file()]) .args(RUSTC_COLOR_ARGS) + .args(RUSTC_EDITION_ARGS) .output(), Mode::Test => Command::new("rustc") .args(&["--test", self.path.to_str().unwrap(), "-o", &temp_file()]) .args(RUSTC_COLOR_ARGS) + .args(RUSTC_EDITION_ARGS) .output(), Mode::Clippy => { let cargo_toml = format!( @@ -140,6 +143,7 @@ path = "{}.rs""#, Command::new("rustc") .args(&[self.path.to_str().unwrap(), "-o", &temp_file()]) .args(RUSTC_COLOR_ARGS) + .args(RUSTC_EDITION_ARGS) .output() .expect("Failed to compile!"); // Due to an issue with Clippy, a cargo clean is required to catch all lints. @@ -154,7 +158,7 @@ path = "{}.rs""#, Command::new("cargo") .args(&["clippy", "--manifest-path", CLIPPY_CARGO_TOML_PATH]) .args(RUSTC_COLOR_ARGS) - .args(&["--", "-D", "warnings","-D","clippy::float_cmp"]) + .args(&["--", "-D", "warnings", "-D", "clippy::float_cmp"]) .output() } } |