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

4 files changed, 48 insertions, 0 deletions

diff --git a/solutions/21_macros/macros1.rs b/solutions/21_macros/macros1.rs
new file mode 100644
index 0000000..1b86156
--- /dev/null
+++ b/solutions/21_macros/macros1.rs
@@ -0,0 +1,10 @@
+macro_rules! my_macro {
+    () => {
+        println!("Check out my macro!");
+    };
+}
+
+fn main() {
+    my_macro!();
+    //      ^
+}
diff --git a/solutions/21_macros/macros2.rs b/solutions/21_macros/macros2.rs
new file mode 100644
index 0000000..b6fd5d2
--- /dev/null
+++ b/solutions/21_macros/macros2.rs
@@ -0,0 +1,10 @@
+// Moved the macro definition to be before its call.
+macro_rules! my_macro {
+    () => {
+        println!("Check out my macro!");
+    };
+}
+
+fn main() {
+    my_macro!();
+}
diff --git a/solutions/21_macros/macros3.rs b/solutions/21_macros/macros3.rs
new file mode 100644
index 0000000..df35be4
--- /dev/null
+++ b/solutions/21_macros/macros3.rs
@@ -0,0 +1,13 @@
+// Added the attribute `macro_use` attribute.
+#[macro_use]
+mod macros {
+    macro_rules! my_macro {
+        () => {
+            println!("Check out my macro!");
+        };
+    }
+}
+
+fn main() {
+    my_macro!();
+}
diff --git a/solutions/21_macros/macros4.rs b/solutions/21_macros/macros4.rs
new file mode 100644
index 0000000..41bcad1
--- /dev/null
+++ b/solutions/21_macros/macros4.rs
@@ -0,0 +1,15 @@
+// Added semicolons to separate the macro arms.
+#[rustfmt::skip]
+macro_rules! my_macro {
+    () => {
+        println!("Check out my macro!");
+    };
+    ($val:expr) => {
+        println!("Look at this other macro: {}", $val);
+    };
+}
+
+fn main() {
+    my_macro!();
+    my_macro!(7777);
+}