2019-11-11 12:38:24 +00:00
|
|
|
use regex::Regex;
|
2019-04-12 22:48:57 +01:00
|
|
|
use serde::Deserialize;
|
2021-04-18 14:40:47 +01:00
|
|
|
use std::env;
|
2019-04-11 21:41:24 +01:00
|
|
|
use std::fmt::{self, Display, Formatter};
|
2020-02-14 14:25:03 +00:00
|
|
|
use std::fs::{self, remove_file, File};
|
2019-11-11 12:38:24 +00:00
|
|
|
use std::io::Read;
|
2019-05-22 12:50:23 +01:00
|
|
|
use std::path::PathBuf;
|
2020-02-20 19:11:53 +00:00
|
|
|
use std::process::{self, Command};
|
2019-04-11 21:41:24 +01:00
|
|
|
|
|
|
|
const RUSTC_COLOR_ARGS: &[&str] = &["--color", "always"];
|
2019-11-11 12:38:24 +00:00
|
|
|
const I_AM_DONE_REGEX: &str = r"(?m)^\s*///?\s*I\s+AM\s+NOT\s+DONE";
|
|
|
|
const CONTEXT: usize = 2;
|
2020-02-14 14:25:03 +00:00
|
|
|
const CLIPPY_CARGO_TOML_PATH: &str = "./exercises/clippy/Cargo.toml";
|
2019-04-11 21:41:24 +01:00
|
|
|
|
2020-10-30 13:39:28 +00:00
|
|
|
// Get a temporary file name that is hopefully unique
|
2020-06-04 15:31:17 +01:00
|
|
|
#[inline]
|
2019-04-11 21:41:24 +01:00
|
|
|
fn temp_file() -> String {
|
2020-10-30 13:39:28 +00:00
|
|
|
let thread_id: String = format!("{:?}", std::thread::current().id())
|
|
|
|
.chars()
|
|
|
|
.filter(|c| c.is_alphanumeric())
|
|
|
|
.collect();
|
|
|
|
|
|
|
|
format!("./temp_{}_{}", process::id(), thread_id)
|
2019-04-11 21:41:24 +01:00
|
|
|
}
|
|
|
|
|
2020-06-04 15:31:17 +01:00
|
|
|
// The mode of the exercise.
|
feat: Replace clap with argh
I’ve been wanting to do this for a while, but always procrastinated on it. We’ve been using Clap since the 2.0 rewrite, but Clap is known to be a fairly heavy library. Since Rustlings is usually peoples’ first contact with a Rust compilation, I think it’s in our best interests that this complation is as fast as possible. In effect, replacing Clap with the smaller, structopt-style `argh` reduces the amount of crates needing to be compiled from 82 to 60.
I also think this makes the code way easier to read, we don’t need to use Clap’s methods anymore, but can switch over to using pure Rust methods, e.g., switches are booleans, options are Option<String>s or the like, and subcommands are just structs.
2021-04-20 11:46:49 +01:00
|
|
|
#[derive(Deserialize, Copy, Clone, Debug)]
|
2019-04-11 21:41:24 +01:00
|
|
|
#[serde(rename_all = "lowercase")]
|
|
|
|
pub enum Mode {
|
2020-06-04 15:31:17 +01:00
|
|
|
// Indicates that the exercise should be compiled as a binary
|
2019-04-11 21:41:24 +01:00
|
|
|
Compile,
|
2020-06-04 15:31:17 +01:00
|
|
|
// Indicates that the exercise should be compiled as a test harness
|
2019-04-11 21:41:24 +01:00
|
|
|
Test,
|
2020-06-04 15:31:17 +01:00
|
|
|
// Indicates that the exercise should be linted with clippy
|
2020-02-14 14:25:03 +00:00
|
|
|
Clippy,
|
2019-04-11 21:41:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Deserialize)]
|
|
|
|
pub struct ExerciseList {
|
|
|
|
pub exercises: Vec<Exercise>,
|
|
|
|
}
|
|
|
|
|
2020-06-04 15:31:17 +01:00
|
|
|
// A representation of a rustlings exercise.
|
|
|
|
// This is deserialized from the accompanying info.toml file
|
feat: Replace clap with argh
I’ve been wanting to do this for a while, but always procrastinated on it. We’ve been using Clap since the 2.0 rewrite, but Clap is known to be a fairly heavy library. Since Rustlings is usually peoples’ first contact with a Rust compilation, I think it’s in our best interests that this complation is as fast as possible. In effect, replacing Clap with the smaller, structopt-style `argh` reduces the amount of crates needing to be compiled from 82 to 60.
I also think this makes the code way easier to read, we don’t need to use Clap’s methods anymore, but can switch over to using pure Rust methods, e.g., switches are booleans, options are Option<String>s or the like, and subcommands are just structs.
2021-04-20 11:46:49 +01:00
|
|
|
#[derive(Deserialize, Debug)]
|
2019-04-11 21:41:24 +01:00
|
|
|
pub struct Exercise {
|
2020-06-04 15:31:17 +01:00
|
|
|
// Name of the exercise
|
2019-11-11 14:46:32 +00:00
|
|
|
pub name: String,
|
2020-06-04 15:31:17 +01:00
|
|
|
// The path to the file containing the exercise's source code
|
2019-04-11 21:41:24 +01:00
|
|
|
pub path: PathBuf,
|
2020-06-04 15:31:17 +01:00
|
|
|
// The mode of the exercise (Test, Compile, or Clippy)
|
2019-04-11 21:41:24 +01:00
|
|
|
pub mode: Mode,
|
2020-06-04 15:31:17 +01:00
|
|
|
// The hint text associated with the exercise
|
2019-11-11 15:51:38 +00:00
|
|
|
pub hint: String,
|
2019-04-11 21:41:24 +01:00
|
|
|
}
|
|
|
|
|
2020-06-04 15:31:17 +01:00
|
|
|
// An enum to track of the state of an Exercise.
|
|
|
|
// An Exercise can be either Done or Pending
|
2019-11-11 12:38:24 +00:00
|
|
|
#[derive(PartialEq, Debug)]
|
|
|
|
pub enum State {
|
2020-06-04 15:31:17 +01:00
|
|
|
// The state of the exercise once it's been completed
|
2019-11-11 12:38:24 +00:00
|
|
|
Done,
|
2020-06-04 15:31:17 +01:00
|
|
|
// The state of the exercise while it's not completed yet
|
2019-11-11 12:38:24 +00:00
|
|
|
Pending(Vec<ContextLine>),
|
|
|
|
}
|
|
|
|
|
2020-06-04 15:31:17 +01:00
|
|
|
// The context information of a pending exercise
|
2019-11-11 12:38:24 +00:00
|
|
|
#[derive(PartialEq, Debug)]
|
|
|
|
pub struct ContextLine {
|
2020-06-04 15:31:17 +01:00
|
|
|
// The source code that is still pending completion
|
2019-11-11 12:38:24 +00:00
|
|
|
pub line: String,
|
2020-06-04 15:31:17 +01:00
|
|
|
// The line number of the source code still pending completion
|
2019-11-11 12:38:24 +00:00
|
|
|
pub number: usize,
|
2020-06-04 15:31:17 +01:00
|
|
|
// Whether or not this is important
|
2019-11-11 12:38:24 +00:00
|
|
|
pub important: bool,
|
|
|
|
}
|
|
|
|
|
2020-06-04 15:31:17 +01:00
|
|
|
// The result of compiling an exercise
|
2020-02-20 19:11:53 +00:00
|
|
|
pub struct CompiledExercise<'a> {
|
|
|
|
exercise: &'a Exercise,
|
|
|
|
_handle: FileHandle,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> CompiledExercise<'a> {
|
2020-06-04 15:31:17 +01:00
|
|
|
// Run the compiled exercise
|
2020-02-20 19:11:53 +00:00
|
|
|
pub fn run(&self) -> Result<ExerciseOutput, ExerciseOutput> {
|
|
|
|
self.exercise.run()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-04 15:31:17 +01:00
|
|
|
// A representation of an already executed binary
|
2020-02-20 19:11:53 +00:00
|
|
|
#[derive(Debug)]
|
|
|
|
pub struct ExerciseOutput {
|
2020-06-04 15:31:17 +01:00
|
|
|
// The textual contents of the standard output of the binary
|
2020-02-20 19:11:53 +00:00
|
|
|
pub stdout: String,
|
2020-06-04 15:31:17 +01:00
|
|
|
// The textual contents of the standard error of the binary
|
2020-02-20 19:11:53 +00:00
|
|
|
pub stderr: String,
|
|
|
|
}
|
|
|
|
|
|
|
|
struct FileHandle;
|
|
|
|
|
|
|
|
impl Drop for FileHandle {
|
|
|
|
fn drop(&mut self) {
|
|
|
|
clean();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-11 21:41:24 +01:00
|
|
|
impl Exercise {
|
2020-02-20 19:11:53 +00:00
|
|
|
pub fn compile(&self) -> Result<CompiledExercise, ExerciseOutput> {
|
|
|
|
let cmd = match self.mode {
|
2019-04-11 21:41:24 +01:00
|
|
|
Mode::Compile => Command::new("rustc")
|
|
|
|
.args(&[self.path.to_str().unwrap(), "-o", &temp_file()])
|
|
|
|
.args(RUSTC_COLOR_ARGS)
|
|
|
|
.output(),
|
|
|
|
Mode::Test => Command::new("rustc")
|
|
|
|
.args(&["--test", self.path.to_str().unwrap(), "-o", &temp_file()])
|
|
|
|
.args(RUSTC_COLOR_ARGS)
|
|
|
|
.output(),
|
2020-02-14 14:25:03 +00:00
|
|
|
Mode::Clippy => {
|
|
|
|
let cargo_toml = format!(
|
|
|
|
r#"[package]
|
|
|
|
name = "{}"
|
|
|
|
version = "0.0.1"
|
|
|
|
edition = "2018"
|
|
|
|
[[bin]]
|
|
|
|
name = "{}"
|
|
|
|
path = "{}.rs""#,
|
|
|
|
self.name, self.name, self.name
|
|
|
|
);
|
2021-03-20 18:52:57 +00:00
|
|
|
let cargo_toml_error_msg = if env::var("NO_EMOJI").is_ok() {
|
|
|
|
"Failed to write Clippy Cargo.toml file."
|
|
|
|
} else {
|
|
|
|
"Failed to write 📎 Clippy 📎 Cargo.toml file."
|
2021-03-19 09:16:07 +00:00
|
|
|
};
|
2021-04-18 14:40:47 +01:00
|
|
|
fs::write(CLIPPY_CARGO_TOML_PATH, cargo_toml).expect(cargo_toml_error_msg);
|
2021-09-21 10:50:15 +01:00
|
|
|
// To support the ability to run the clippy exercises, build
|
2020-04-08 05:30:29 +01:00
|
|
|
// an executable, in addition to running clippy. With a
|
|
|
|
// compilation failure, this would silently fail. But we expect
|
|
|
|
// clippy to reflect the same failure while compiling later.
|
|
|
|
Command::new("rustc")
|
|
|
|
.args(&[self.path.to_str().unwrap(), "-o", &temp_file()])
|
|
|
|
.args(RUSTC_COLOR_ARGS)
|
|
|
|
.output()
|
|
|
|
.expect("Failed to compile!");
|
2020-02-14 14:25:03 +00:00
|
|
|
// Due to an issue with Clippy, a cargo clean is required to catch all lints.
|
|
|
|
// See https://github.com/rust-lang/rust-clippy/issues/2604
|
2020-06-14 13:48:51 +01:00
|
|
|
// This is already fixed on Clippy's master branch. See this issue to track merging into Cargo:
|
2020-02-14 14:25:03 +00:00
|
|
|
// https://github.com/rust-lang/rust-clippy/issues/3837
|
|
|
|
Command::new("cargo")
|
|
|
|
.args(&["clean", "--manifest-path", CLIPPY_CARGO_TOML_PATH])
|
|
|
|
.args(RUSTC_COLOR_ARGS)
|
|
|
|
.output()
|
|
|
|
.expect("Failed to run 'cargo clean'");
|
|
|
|
Command::new("cargo")
|
|
|
|
.args(&["clippy", "--manifest-path", CLIPPY_CARGO_TOML_PATH])
|
|
|
|
.args(RUSTC_COLOR_ARGS)
|
|
|
|
.args(&["--", "-D", "warnings"])
|
|
|
|
.output()
|
|
|
|
}
|
2019-04-11 21:41:24 +01:00
|
|
|
}
|
2020-02-20 19:11:53 +00:00
|
|
|
.expect("Failed to run 'compile' command.");
|
|
|
|
|
|
|
|
if cmd.status.success() {
|
|
|
|
Ok(CompiledExercise {
|
2021-08-24 13:06:30 +01:00
|
|
|
exercise: self,
|
2020-02-20 19:11:53 +00:00
|
|
|
_handle: FileHandle,
|
|
|
|
})
|
|
|
|
} else {
|
|
|
|
clean();
|
|
|
|
Err(ExerciseOutput {
|
|
|
|
stdout: String::from_utf8_lossy(&cmd.stdout).to_string(),
|
|
|
|
stderr: String::from_utf8_lossy(&cmd.stderr).to_string(),
|
|
|
|
})
|
|
|
|
}
|
2019-04-11 21:41:24 +01:00
|
|
|
}
|
|
|
|
|
2020-02-20 19:11:53 +00:00
|
|
|
fn run(&self) -> Result<ExerciseOutput, ExerciseOutput> {
|
2020-06-04 15:31:17 +01:00
|
|
|
let arg = match self.mode {
|
|
|
|
Mode::Test => "--show-output",
|
2020-08-10 15:42:54 +01:00
|
|
|
_ => "",
|
2020-06-04 15:31:17 +01:00
|
|
|
};
|
2020-08-10 15:42:54 +01:00
|
|
|
let cmd = Command::new(&temp_file())
|
|
|
|
.arg(arg)
|
2019-04-11 21:41:24 +01:00
|
|
|
.output()
|
2020-02-20 19:11:53 +00:00
|
|
|
.expect("Failed to run 'run' command");
|
|
|
|
|
|
|
|
let output = ExerciseOutput {
|
|
|
|
stdout: String::from_utf8_lossy(&cmd.stdout).to_string(),
|
|
|
|
stderr: String::from_utf8_lossy(&cmd.stderr).to_string(),
|
|
|
|
};
|
2019-04-11 21:41:24 +01:00
|
|
|
|
2020-02-20 19:11:53 +00:00
|
|
|
if cmd.status.success() {
|
|
|
|
Ok(output)
|
|
|
|
} else {
|
|
|
|
Err(output)
|
|
|
|
}
|
2019-04-11 21:41:24 +01:00
|
|
|
}
|
2019-11-11 12:38:24 +00:00
|
|
|
|
|
|
|
pub fn state(&self) -> State {
|
|
|
|
let mut source_file =
|
|
|
|
File::open(&self.path).expect("We were unable to open the exercise file!");
|
|
|
|
|
|
|
|
let source = {
|
|
|
|
let mut s = String::new();
|
|
|
|
source_file
|
|
|
|
.read_to_string(&mut s)
|
|
|
|
.expect("We were unable to read the exercise file!");
|
|
|
|
s
|
|
|
|
};
|
|
|
|
|
|
|
|
let re = Regex::new(I_AM_DONE_REGEX).unwrap();
|
|
|
|
|
|
|
|
if !re.is_match(&source) {
|
|
|
|
return State::Done;
|
|
|
|
}
|
|
|
|
|
|
|
|
let matched_line_index = source
|
|
|
|
.lines()
|
|
|
|
.enumerate()
|
|
|
|
.filter_map(|(i, line)| if re.is_match(line) { Some(i) } else { None })
|
|
|
|
.next()
|
|
|
|
.expect("This should not happen at all");
|
|
|
|
|
|
|
|
let min_line = ((matched_line_index as i32) - (CONTEXT as i32)).max(0) as usize;
|
|
|
|
let max_line = matched_line_index + CONTEXT;
|
|
|
|
|
|
|
|
let context = source
|
|
|
|
.lines()
|
|
|
|
.enumerate()
|
|
|
|
.filter(|&(i, _)| i >= min_line && i <= max_line)
|
|
|
|
.map(|(i, line)| ContextLine {
|
|
|
|
line: line.to_string(),
|
|
|
|
number: i + 1,
|
|
|
|
important: i == matched_line_index,
|
|
|
|
})
|
|
|
|
.collect();
|
|
|
|
|
|
|
|
State::Pending(context)
|
|
|
|
}
|
2020-12-12 18:45:37 +00:00
|
|
|
|
|
|
|
// Check that the exercise looks to be solved using self.state()
|
|
|
|
// This is not the best way to check since
|
2021-03-12 14:26:57 +00:00
|
|
|
// the user can just remove the "I AM NOT DONE" string from the file
|
2020-12-12 18:45:37 +00:00
|
|
|
// without actually having solved anything.
|
|
|
|
// The only other way to truly check this would to compile and run
|
|
|
|
// the exercise; which would be both costly and counterintuitive
|
|
|
|
pub fn looks_done(&self) -> bool {
|
|
|
|
self.state() == State::Done
|
|
|
|
}
|
2019-04-11 21:41:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Display for Exercise {
|
|
|
|
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
|
|
|
|
write!(f, "{}", self.path.to_str().unwrap())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-04 15:31:17 +01:00
|
|
|
#[inline]
|
2020-02-20 19:11:53 +00:00
|
|
|
fn clean() {
|
|
|
|
let _ignored = remove_file(&temp_file());
|
|
|
|
}
|
|
|
|
|
2019-04-12 22:48:57 +01:00
|
|
|
#[cfg(test)]
|
|
|
|
mod test {
|
|
|
|
use super::*;
|
2019-05-22 12:50:23 +01:00
|
|
|
use std::path::Path;
|
2019-04-12 22:48:57 +01:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_clean() {
|
|
|
|
File::create(&temp_file()).unwrap();
|
|
|
|
let exercise = Exercise {
|
2019-11-11 14:46:32 +00:00
|
|
|
name: String::from("example"),
|
2020-02-20 19:11:53 +00:00
|
|
|
path: PathBuf::from("tests/fixture/state/pending_exercise.rs"),
|
|
|
|
mode: Mode::Compile,
|
2019-11-11 15:51:38 +00:00
|
|
|
hint: String::from(""),
|
2019-04-12 22:48:57 +01:00
|
|
|
};
|
2020-02-20 19:11:53 +00:00
|
|
|
let compiled = exercise.compile().unwrap();
|
|
|
|
drop(compiled);
|
2019-04-12 22:48:57 +01:00
|
|
|
assert!(!Path::new(&temp_file()).exists());
|
|
|
|
}
|
2019-11-11 12:38:24 +00:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_pending_state() {
|
|
|
|
let exercise = Exercise {
|
2019-11-11 16:28:19 +00:00
|
|
|
name: "pending_exercise".into(),
|
2019-11-11 12:38:24 +00:00
|
|
|
path: PathBuf::from("tests/fixture/state/pending_exercise.rs"),
|
|
|
|
mode: Mode::Compile,
|
2019-11-11 16:28:19 +00:00
|
|
|
hint: String::new(),
|
2019-11-11 12:38:24 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
let state = exercise.state();
|
|
|
|
let expected = vec![
|
|
|
|
ContextLine {
|
|
|
|
line: "// fake_exercise".to_string(),
|
|
|
|
number: 1,
|
|
|
|
important: false,
|
|
|
|
},
|
|
|
|
ContextLine {
|
|
|
|
line: "".to_string(),
|
|
|
|
number: 2,
|
|
|
|
important: false,
|
|
|
|
},
|
|
|
|
ContextLine {
|
|
|
|
line: "// I AM NOT DONE".to_string(),
|
|
|
|
number: 3,
|
|
|
|
important: true,
|
|
|
|
},
|
|
|
|
ContextLine {
|
|
|
|
line: "".to_string(),
|
|
|
|
number: 4,
|
|
|
|
important: false,
|
|
|
|
},
|
|
|
|
ContextLine {
|
|
|
|
line: "fn main() {".to_string(),
|
|
|
|
number: 5,
|
|
|
|
important: false,
|
|
|
|
},
|
|
|
|
];
|
|
|
|
|
|
|
|
assert_eq!(state, State::Pending(expected));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_finished_exercise() {
|
|
|
|
let exercise = Exercise {
|
2019-11-11 16:28:19 +00:00
|
|
|
name: "finished_exercise".into(),
|
2019-11-11 12:38:24 +00:00
|
|
|
path: PathBuf::from("tests/fixture/state/finished_exercise.rs"),
|
|
|
|
mode: Mode::Compile,
|
2019-11-11 16:28:19 +00:00
|
|
|
hint: String::new(),
|
2019-11-11 12:38:24 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
assert_eq!(exercise.state(), State::Done);
|
|
|
|
}
|
2020-06-04 15:31:17 +01:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_exercise_with_output() {
|
|
|
|
let exercise = Exercise {
|
2020-09-27 20:57:51 +01:00
|
|
|
name: "exercise_with_output".into(),
|
2020-06-04 15:31:17 +01:00
|
|
|
path: PathBuf::from("tests/fixture/success/testSuccess.rs"),
|
|
|
|
mode: Mode::Test,
|
|
|
|
hint: String::new(),
|
|
|
|
};
|
|
|
|
let out = exercise.compile().unwrap().run().unwrap();
|
|
|
|
assert!(out.stdout.contains("THIS TEST TOO SHALL PASS"));
|
|
|
|
}
|
2019-04-11 21:41:24 +01:00
|
|
|
}
|