Merge remote-tracking branch 'upstream/main' into fix-enum-variant-inconsistency

19 files changed, 69 insertions, 32 deletions

diff --git a/tests/fixture/failure/Cargo.toml b/tests/fixture/failure/Cargo.toml
new file mode 100644
index 0000000..7ee2f06
--- /dev/null
+++ b/tests/fixture/failure/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "failure"
+edition = "2021"
+publish = false
+
+[[bin]]
+name = "compFailure"
+path = "exercises/compFailure.rs"
+
+[[bin]]
+name = "compNoExercise"
+path = "exercises/compNoExercise.rs"
+
+[[bin]]
+name = "testFailure"
+path = "exercises/testFailure.rs"
+
+[[bin]]
+name = "testNotPassed"
+path = "exercises/testNotPassed.rs"
diff --git a/tests/fixture/failure/compNoExercise.rs b/tests/fixture/failure/compNoExercise.rs
deleted file mode 100644
index f79c691..0000000
--- a/tests/fixture/failure/compNoExercise.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-fn main() {
-}
diff --git a/tests/fixture/failure/compFailure.rs b/tests/fixture/failure/exercises/compFailure.rs
index 566856a..566856a 100644
--- a/tests/fixture/failure/compFailure.rs
+++ b/tests/fixture/failure/exercises/compFailure.rs
diff --git a/tests/fixture/failure/exercises/compNoExercise.rs b/tests/fixture/failure/exercises/compNoExercise.rs
new file mode 100644
index 0000000..f328e4d
--- /dev/null
+++ b/tests/fixture/failure/exercises/compNoExercise.rs
@@ -0,0 +1 @@
+fn main() {}
diff --git a/tests/fixture/failure/testFailure.rs b/tests/fixture/failure/exercises/testFailure.rs
index b33a5d2..fcbcf90 100644
--- a/tests/fixture/failure/testFailure.rs
+++ b/tests/fixture/failure/exercises/testFailure.rs
@@ -1,3 +1,5 @@
+fn main() {}
+
 #[test]
 fn passing() {
     asset!(true);
diff --git a/tests/fixture/failure/testNotPassed.rs b/tests/fixture/failure/exercises/testNotPassed.rs
index a9fe88d..de0d61c 100644
--- a/tests/fixture/failure/testNotPassed.rs
+++ b/tests/fixture/failure/exercises/testNotPassed.rs
@@ -1,3 +1,5 @@
+fn main() {}
+
 #[test]
 fn not_passing() {
     assert!(false);
diff --git a/tests/fixture/failure/info.toml b/tests/fixture/failure/info.toml
index e5949f9..554607a 100644
--- a/tests/fixture/failure/info.toml
+++ b/tests/fixture/failure/info.toml
@@ -1,11 +1,10 @@
+format_version = 1
+
 [[exercises]]
 name = "compFailure"
-path = "compFailure.rs"
-mode = "compile"
+test = false
 hint = ""
 
 [[exercises]]
 name = "testFailure"
-path = "testFailure.rs"
-mode = "test"
 hint = "Hello!"
diff --git a/tests/fixture/state/Cargo.toml b/tests/fixture/state/Cargo.toml
new file mode 100644
index 0000000..adbd8ab
--- /dev/null
+++ b/tests/fixture/state/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "state"
+edition = "2021"
+publish = false
+
+[[bin]]
+name = "pending_exercise"
+path = "exercises/pending_exercise.rs"
+
+[[bin]]
+name = "pending_test_exercise"
+path = "exercises/pending_test_exercise.rs"
+
+[[bin]]
+name = "finished_exercise"
+path = "exercises/finished_exercise.rs"
diff --git a/tests/fixture/state/exercises/finished_exercise.rs b/tests/fixture/state/exercises/finished_exercise.rs
new file mode 100644
index 0000000..f328e4d
--- /dev/null
+++ b/tests/fixture/state/exercises/finished_exercise.rs
@@ -0,0 +1 @@
+fn main() {}
diff --git a/tests/fixture/state/exercises/pending_exercise.rs b/tests/fixture/state/exercises/pending_exercise.rs
new file mode 100644
index 0000000..f328e4d
--- /dev/null
+++ b/tests/fixture/state/exercises/pending_exercise.rs
@@ -0,0 +1 @@
+fn main() {}
diff --git a/tests/fixture/state/pending_test_exercise.rs b/tests/fixture/state/exercises/pending_test_exercise.rs
index 8756f02..718e1db 100644
--- a/tests/fixture/state/pending_test_exercise.rs
+++ b/tests/fixture/state/exercises/pending_test_exercise.rs
@@ -1,4 +1,4 @@
-// I AM NOT DONE
+fn main() {}
 
 #[test]
 fn it_works() {}
diff --git a/tests/fixture/state/finished_exercise.rs b/tests/fixture/state/finished_exercise.rs
deleted file mode 100644
index 016b827..0000000
--- a/tests/fixture/state/finished_exercise.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-// fake_exercise
-
-fn main() {
-
-}
diff --git a/tests/fixture/state/info.toml b/tests/fixture/state/info.toml
index 547b3a4..ff0b932 100644
--- a/tests/fixture/state/info.toml
+++ b/tests/fixture/state/info.toml
@@ -1,18 +1,15 @@
+format_version = 1
+
 [[exercises]]
 name = "pending_exercise"
-path = "pending_exercise.rs"
-mode = "compile"
+test = false
 hint = """"""
 
 [[exercises]]
 name = "pending_test_exercise"
-path = "pending_test_exercise.rs"
-mode = "test"
 hint = """"""
 
 [[exercises]]
 name = "finished_exercise"
-path = "finished_exercise.rs"
-mode = "compile"
+test = false
 hint = """"""
-
diff --git a/tests/fixture/state/pending_exercise.rs b/tests/fixture/state/pending_exercise.rs
deleted file mode 100644
index f579d0b..0000000
--- a/tests/fixture/state/pending_exercise.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// fake_exercise
-
-// I AM NOT DONE
-
-fn main() {
-
-}
diff --git a/tests/fixture/success/Cargo.toml b/tests/fixture/success/Cargo.toml
new file mode 100644
index 0000000..028cf35
--- /dev/null
+++ b/tests/fixture/success/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "success"
+edition = "2021"
+publish = false
+
+[[bin]]
+name = "compSuccess"
+path = "exercises/compSuccess.rs"
+
+[[bin]]
+name = "testSuccess"
+path = "exercises/testSuccess.rs"
diff --git a/tests/fixture/success/compSuccess.rs b/tests/fixture/success/compSuccess.rs
deleted file mode 100644
index f79c691..0000000
--- a/tests/fixture/success/compSuccess.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-fn main() {
-}
diff --git a/tests/fixture/success/exercises/compSuccess.rs b/tests/fixture/success/exercises/compSuccess.rs
new file mode 100644
index 0000000..f328e4d
--- /dev/null
+++ b/tests/fixture/success/exercises/compSuccess.rs
@@ -0,0 +1 @@
+fn main() {}
diff --git a/tests/fixture/success/testSuccess.rs b/tests/fixture/success/exercises/testSuccess.rs
index 7139b50..4296cf6 100644
--- a/tests/fixture/success/testSuccess.rs
+++ b/tests/fixture/success/exercises/testSuccess.rs
@@ -1,3 +1,5 @@
+fn main() {}
+
 #[test]
 fn passing() {
     println!("THIS TEST TOO SHALL PASS");
diff --git a/tests/fixture/success/info.toml b/tests/fixture/success/info.toml
index 68d3538..d66d7d4 100644
--- a/tests/fixture/success/info.toml
+++ b/tests/fixture/success/info.toml
@@ -1,11 +1,10 @@
+format_version = 1
+
 [[exercises]]
 name = "compSuccess"
-path = "compSuccess.rs"
-mode = "compile"
+test = false
 hint = """"""
 
 [[exercises]]
 name = "testSuccess"
-path = "testSuccess.rs"
-mode = "test"
 hint = """"""