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

4 files changed, 5 insertions, 30 deletions

diff --git a/exercises/21_macros/macros1.rs b/exercises/21_macros/macros1.rs
index 678de6e..fb3c3ff 100644
--- a/exercises/21_macros/macros1.rs
+++ b/exercises/21_macros/macros1.rs
@@ -1,10 +1,3 @@
-// macros1.rs
-//
-// Execute `rustlings hint macros1` or use the `hint` watch subcommand for a
-// hint.
-
-// I AM NOT DONE
-
 macro_rules! my_macro {
     () => {
         println!("Check out my macro!");
@@ -12,5 +5,6 @@ macro_rules! my_macro {
 }
 
 fn main() {
+    // TODO: Fix the macro call.
     my_macro();
 }
diff --git a/exercises/21_macros/macros2.rs b/exercises/21_macros/macros2.rs
index 788fc16..2d9dec7 100644
--- a/exercises/21_macros/macros2.rs
+++ b/exercises/21_macros/macros2.rs
@@ -1,14 +1,8 @@
-// macros2.rs
-//
-// Execute `rustlings hint macros2` or use the `hint` watch subcommand for a
-// hint.
-
-// I AM NOT DONE
-
 fn main() {
     my_macro!();
 }
 
+// TODO: Fix the compiler error by moving the whole definition of this macro.
 macro_rules! my_macro {
     () => {
         println!("Check out my macro!");
diff --git a/exercises/21_macros/macros3.rs b/exercises/21_macros/macros3.rs
index b795c14..9537494 100644
--- a/exercises/21_macros/macros3.rs
+++ b/exercises/21_macros/macros3.rs
@@ -1,12 +1,5 @@
-// macros3.rs
-//
-// Make me compile, without taking the macro out of the module!
-//
-// Execute `rustlings hint macros3` or use the `hint` watch subcommand for a
-// hint.
-
-// I AM NOT DONE
-
+// TODO: Fix the compiler error without taking the macro definition out of this
+// module.
 mod macros {
     macro_rules! my_macro {
         () => {
diff --git a/exercises/21_macros/macros4.rs b/exercises/21_macros/macros4.rs
index 71b45a0..9d77f6a 100644
--- a/exercises/21_macros/macros4.rs
+++ b/exercises/21_macros/macros4.rs
@@ -1,10 +1,4 @@
-// macros4.rs
-//
-// Execute `rustlings hint macros4` or use the `hint` watch subcommand for a
-// hint.
-
-// I AM NOT DONE
-
+// TODO: Fix the compiler error by adding one or two characters.
 #[rustfmt::skip]
 macro_rules! my_macro {
     () => {