Merge pull request #1955 from rust-lang/solutions

Solutions

Cargo.lock

@@ -656,9 +656,9 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "rustix"
-version = "0.38.33"
+version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3cc72858054fcff6d7dea32df2aeaee6a7c24227366d7ea429aada2f26b16ad"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
  "bitflags 2.5.0",
  "errno",
@@ -690,6 +690,8 @@ name = "rustlings-macros"
 version = "6.0.0-alpha.0"
 dependencies = [
  "quote",
+ "serde",
+ "toml_edit",
 ]
 
 [[package]]

Cargo.toml

@@ -17,6 +17,10 @@ authors = [
 license = "MIT"
 edition = "2021"
 
+[workspace.dependencies]
+serde = { version = "1.0.198", features = ["derive"] }
+toml_edit = { version = "0.22.12", default-features = false, features = ["parse", "serde"] }
+
 [package]
 name = "rustlings"
 description = "Small exercises to get you used to reading and writing Rust code!"
@@ -41,8 +45,8 @@ hashbrown = "0.14.3"
 notify-debouncer-mini = "0.4.1"
 ratatui = "0.26.2"
 rustlings-macros = { path = "rustlings-macros", version = "6.0.0-alpha.0" }
-serde = { version = "1.0.198", features = ["derive"] }
+serde.workspace = true
-toml_edit = { version = "0.22.12", default-features = false, features = ["parse", "serde"] }
+toml_edit.workspace = true
 which = "6.0.1"
 
 [dev-dependencies]

README.md

@@ -90,11 +90,6 @@ You can also get the hint for the next pending exercise with the following comma
 rustlings hint
 ```
 
-## Quizzes
-
-After every couple of sections, there will be a quiz that'll test your knowledge on a bunch of sections at once.
-These quizzes are found in `exercises/quizN.rs`.
-
 ## Continuing On
 
 <!-- TODO: Mention third-party exercises -->

exercises/quizzes/README.md

@@ -0,0 +1,3 @@
+# Quizzes
+
+After every couple of sections, there will be a quiz in this directory that'll test your knowledge on a bunch of sections at once.

info.toml

@@ -236,6 +236,7 @@ Make sure the type is consistent across all arms."""
 
 [[exercises]]
 name = "quiz1"
+dir = "quizzes"
 mode = "test"
 hint = "No hints this time ;)"
 
@@ -637,6 +638,7 @@ Learn more at https://doc.rust-lang.org/book/ch08-03-hash-maps.html#updating-a-v
 
 [[exercises]]
 name = "quiz2"
+dir = "quizzes"
 mode = "test"
 hint = "No hints this time ;)"
 
@@ -870,6 +872,7 @@ See the documentation at: https://doc.rust-lang.org/book/ch10-02-traits.html#spe
 
 [[exercises]]
 name = "quiz3"
+dir = "quizzes"
 mode = "test"
 hint = """
 To find the best solution to this challenge you're going to need to think back

rustlings-macros/Cargo.toml

@@ -11,3 +11,5 @@ proc-macro = true
 
 [dependencies]
 quote = "1.0.36"
+serde.workspace = true
+toml_edit.workspace = true

rustlings-macros/src/lib.rs

@@ -1,86 +1,39 @@
 use proc_macro::TokenStream;
 use quote::quote;
-use std::{fs::read_dir, panic, path::PathBuf};
+use serde::Deserialize;
 
-fn path_to_string(path: PathBuf) -> String {
+#[derive(Deserialize)]
-    path.into_os_string()
+struct ExerciseInfo {
-        .into_string()
+    name: String,
-        .unwrap_or_else(|original| {
+    dir: String,
-            panic!("The path {} is invalid UTF8", original.to_string_lossy());
+}
-        })
+
+#[derive(Deserialize)]
+struct InfoFile {
+    exercises: Vec<ExerciseInfo>,
 }
 
 #[proc_macro]
 pub fn include_files(_: TokenStream) -> TokenStream {
-    let mut files = Vec::with_capacity(8);
+    let exercises = toml_edit::de::from_str::<InfoFile>(include_str!("../../info.toml"))
-    let mut dirs = Vec::with_capacity(128);
+        .expect("Failed to parse `info.toml`")
+        .exercises;
 
-    for entry in read_dir("exercises").expect("Failed to open the `exercises` directory") {
+    let exercise_files = exercises
-        let entry = entry.expect("Failed to read the `exercises` directory");
+        .iter()
-
+        .map(|exercise| format!("../exercises/{}/{}.rs", exercise.dir, exercise.name));
-        if entry.file_type().unwrap().is_file() {
+    let solution_files = exercises
-            let path = entry.path();
+        .iter()
-            if path.file_name().unwrap() != "README.md" {
+        .map(|exercise| format!("../solutions/{}/{}.rs", exercise.dir, exercise.name));
-                files.push(path_to_string(path));
+    let dirs = exercises.iter().map(|exercise| &exercise.dir);
-            }
+    let readmes = exercises
-
+        .iter()
-            continue;
+        .map(|exercise| format!("../exercises/{}/README.md", exercise.dir));
-        }
-
-        let dir_path = entry.path();
-        let dir_files = read_dir(&dir_path).unwrap_or_else(|e| {
-            panic!("Failed to open the directory {}: {e}", dir_path.display());
-        });
-        let dir_path = path_to_string(dir_path);
-        let dir_files = dir_files.filter_map(|entry| {
-            let entry = entry.unwrap_or_else(|e| {
-                panic!("Failed to read the directory {dir_path}: {e}");
-            });
-            let path = entry.path();
-
-            if !entry.file_type().unwrap().is_file() {
-                panic!("Found {} but expected only files", path.display());
-            }
-
-            if path.file_name().unwrap() == "README.md" {
-                return None;
-            }
-
-            Some(path_to_string(path))
-        });
-
-        dirs.push(quote! {
-            EmbeddedFlatDir {
-                path: #dir_path,
-                readme: EmbeddedFile {
-                    path: ::std::concat!(#dir_path, "/README.md"),
-                    content: ::std::include_bytes!(::std::concat!("../", #dir_path, "/README.md")),
-                },
-                content: &[
-                    #(EmbeddedFile {
-                        path: #dir_files,
-                        content: ::std::include_bytes!(::std::concat!("../", #dir_files)),
-                    }),*
-                ],
-            }
-        });
-    }
 
     quote! {
         EmbeddedFiles {
-            exercises_dir: ExercisesDir {
+            exercise_files: &[#(ExerciseFiles { exercise: include_bytes!(#exercise_files), solution: include_bytes!(#solution_files) }),*],
-                readme: EmbeddedFile {
+            exercise_dirs: &[#(ExerciseDir { name: #dirs, readme: include_bytes!(#readmes) }),*]
-                    path: "exercises/README.md",
-                    content: ::std::include_bytes!("../exercises/README.md"),
-                },
-                files: &[#(
-                     EmbeddedFile {
-                        path: #files,
-                        content: ::std::include_bytes!(::std::concat!("../", #files)),
-                    }
-                ),*],
-                dirs: &[#(#dirs),*],
-            },
         }
     }
     .into()

solutions/00_intro/intro1.rs

@@ -0,0 +1 @@
+// TODO

solutions/00_intro/intro2.rs

@@ -0,0 +1 @@
+// TODO

solutions/01_variables/variables1.rs

@@ -0,0 +1 @@
+// TODO

solutions/01_variables/variables2.rs

@@ -0,0 +1 @@
+// TODO

solutions/01_variables/variables3.rs

@@ -0,0 +1 @@
+// TODO

solutions/01_variables/variables4.rs

@@ -0,0 +1 @@
+// TODO

solutions/01_variables/variables5.rs

@@ -0,0 +1 @@
+// TODO

solutions/01_variables/variables6.rs

@@ -0,0 +1 @@
+// TODO

solutions/02_functions/functions1.rs

@@ -0,0 +1 @@
+// TODO

solutions/02_functions/functions2.rs

@@ -0,0 +1 @@
+// TODO

solutions/02_functions/functions3.rs

@@ -0,0 +1 @@
+// TODO

solutions/02_functions/functions4.rs

@@ -0,0 +1 @@
+// TODO

solutions/02_functions/functions5.rs

@@ -0,0 +1 @@
+// TODO

solutions/03_if/if1.rs

@@ -0,0 +1 @@
+// TODO

solutions/03_if/if2.rs

@@ -0,0 +1 @@
+// TODO

solutions/03_if/if3.rs

@@ -0,0 +1 @@
+// TODO

solutions/04_primitive_types/primitive_types1.rs

@@ -0,0 +1 @@
+// TODO

solutions/04_primitive_types/primitive_types2.rs

@@ -0,0 +1 @@
+// TODO

solutions/04_primitive_types/primitive_types3.rs

@@ -0,0 +1 @@
+// TODO

solutions/04_primitive_types/primitive_types4.rs

@@ -0,0 +1 @@
+// TODO

solutions/04_primitive_types/primitive_types5.rs

@@ -0,0 +1 @@
+// TODO

solutions/04_primitive_types/primitive_types6.rs

@@ -0,0 +1 @@
+// TODO

solutions/05_vecs/vecs1.rs

@@ -0,0 +1 @@
+// TODO

solutions/05_vecs/vecs2.rs

@@ -0,0 +1 @@
+// TODO

solutions/06_move_semantics/move_semantics1.rs

@@ -0,0 +1 @@
+// TODO

solutions/06_move_semantics/move_semantics2.rs

@@ -0,0 +1 @@
+// TODO

solutions/06_move_semantics/move_semantics3.rs

@@ -0,0 +1 @@
+// TODO

solutions/06_move_semantics/move_semantics4.rs

@@ -0,0 +1 @@
+// TODO

solutions/06_move_semantics/move_semantics5.rs

@@ -0,0 +1 @@
+// TODO

solutions/06_move_semantics/move_semantics6.rs

@@ -0,0 +1 @@
+// TODO

solutions/07_structs/structs1.rs

@@ -0,0 +1 @@
+// TODO

solutions/07_structs/structs2.rs

@@ -0,0 +1 @@
+// TODO

solutions/07_structs/structs3.rs

@@ -0,0 +1 @@
+// TODO

solutions/08_enums/enums1.rs

@@ -0,0 +1 @@
+// TODO

solutions/08_enums/enums2.rs

@@ -0,0 +1 @@
+// TODO

solutions/08_enums/enums3.rs

@@ -0,0 +1 @@
+// TODO

solutions/09_strings/strings1.rs

@@ -0,0 +1 @@
+// TODO

solutions/09_strings/strings2.rs

@@ -0,0 +1 @@
+// TODO

solutions/09_strings/strings3.rs

@@ -0,0 +1 @@
+// TODO

solutions/09_strings/strings4.rs

@@ -0,0 +1 @@
+// TODO

solutions/10_modules/modules1.rs

@@ -0,0 +1 @@
+// TODO

solutions/10_modules/modules2.rs

@@ -0,0 +1 @@
+// TODO

solutions/10_modules/modules3.rs

@@ -0,0 +1 @@
+// TODO

solutions/11_hashmaps/hashmaps1.rs

@@ -0,0 +1 @@
+// TODO

solutions/11_hashmaps/hashmaps2.rs

@@ -0,0 +1 @@
+// TODO

solutions/11_hashmaps/hashmaps3.rs

@@ -0,0 +1 @@
+// TODO

solutions/12_options/options1.rs

@@ -0,0 +1 @@
+// TODO

solutions/12_options/options2.rs

@@ -0,0 +1 @@
+// TODO

solutions/12_options/options3.rs

@@ -0,0 +1 @@
+// TODO

solutions/13_error_handling/errors1.rs

@@ -0,0 +1 @@
+// TODO

solutions/13_error_handling/errors2.rs

@@ -0,0 +1 @@
+// TODO

solutions/13_error_handling/errors3.rs

@@ -0,0 +1 @@
+// TODO

solutions/13_error_handling/errors4.rs

@@ -0,0 +1 @@
+// TODO

solutions/13_error_handling/errors5.rs

@@ -0,0 +1 @@
+// TODO

solutions/13_error_handling/errors6.rs

@@ -0,0 +1 @@
+// TODO

solutions/14_generics/generics1.rs

@@ -0,0 +1 @@
+// TODO

solutions/14_generics/generics2.rs

@@ -0,0 +1 @@
+// TODO

solutions/15_traits/traits1.rs

@@ -0,0 +1 @@
+// TODO

solutions/15_traits/traits2.rs

@@ -0,0 +1 @@
+// TODO

solutions/15_traits/traits3.rs

@@ -0,0 +1 @@
+// TODO

solutions/15_traits/traits4.rs

@@ -0,0 +1 @@
+// TODO

solutions/15_traits/traits5.rs

@@ -0,0 +1 @@
+// TODO

solutions/16_lifetimes/lifetimes1.rs

@@ -0,0 +1 @@
+// TODO

solutions/16_lifetimes/lifetimes2.rs

@@ -0,0 +1 @@
+// TODO

solutions/16_lifetimes/lifetimes3.rs

@@ -0,0 +1 @@
+// TODO

solutions/17_tests/tests1.rs

@@ -0,0 +1 @@
+// TODO

solutions/17_tests/tests2.rs

@@ -0,0 +1 @@
+// TODO

solutions/17_tests/tests3.rs

@@ -0,0 +1 @@
+// TODO

solutions/17_tests/tests4.rs

@@ -0,0 +1 @@
+// TODO

solutions/18_iterators/iterators1.rs

@@ -0,0 +1 @@
+// TODO

solutions/18_iterators/iterators2.rs

@@ -0,0 +1 @@
+// TODO

solutions/18_iterators/iterators3.rs

@@ -0,0 +1 @@
+// TODO

solutions/18_iterators/iterators4.rs

@@ -0,0 +1 @@
+// TODO

solutions/18_iterators/iterators5.rs

@@ -0,0 +1 @@
+// TODO

solutions/19_smart_pointers/arc1.rs

@@ -0,0 +1 @@
+// TODO

solutions/19_smart_pointers/box1.rs

@@ -0,0 +1 @@
+// TODO

solutions/19_smart_pointers/cow1.rs

@@ -0,0 +1 @@
+// TODO

solutions/19_smart_pointers/rc1.rs

@@ -0,0 +1 @@
+// TODO

solutions/20_threads/threads1.rs

@@ -0,0 +1 @@
+// TODO

solutions/20_threads/threads2.rs

@@ -0,0 +1 @@
+// TODO

solutions/20_threads/threads3.rs

@@ -0,0 +1 @@
+// TODO

solutions/21_macros/macros1.rs

@@ -0,0 +1 @@
+// TODO

solutions/21_macros/macros2.rs

@@ -0,0 +1 @@
+// TODO

solutions/21_macros/macros3.rs

@@ -0,0 +1 @@
+// TODO

solutions/21_macros/macros4.rs

@@ -0,0 +1 @@
+// TODO

solutions/22_clippy/clippy1.rs

@@ -0,0 +1 @@
+// TODO

solutions/22_clippy/clippy2.rs

@@ -0,0 +1 @@
+// TODO

solutions/22_clippy/clippy3.rs

@@ -0,0 +1 @@
+// TODO

solutions/23_conversions/as_ref_mut.rs

@@ -0,0 +1 @@
+// TODO

solutions/23_conversions/from_into.rs

@@ -0,0 +1 @@
+// TODO