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

3 files changed, 23 insertions, 22 deletions

diff --git a/exercises/14_generics/README.md b/exercises/14_generics/README.md
index de46d50..72cff3f 100644
--- a/exercises/14_generics/README.md
+++ b/exercises/14_generics/README.md
@@ -1,7 +1,7 @@
 # Generics
 
 Generics is the topic of generalizing types and functionalities to broader cases.
-This is extremely useful for reducing code duplication in many ways, but can call for rather involving syntax.
+This is extremely useful for reducing code duplication in many ways, but can call for some rather involved syntax.
 Namely, being generic requires taking great care to specify over which types a generic type is actually considered valid.
 The simplest and most common use of generics is for type parameters.
 
diff --git a/exercises/14_generics/generics1.rs b/exercises/14_generics/generics1.rs
index 35c1d2f..87ed990 100644
--- a/exercises/14_generics/generics1.rs
+++ b/exercises/14_generics/generics1.rs
@@ -1,14 +1,18 @@
-// generics1.rs
-//
-// This shopping list program isn't compiling! Use your knowledge of generics to
-// fix it.
-//
-// Execute `rustlings hint generics1` or use the `hint` watch subcommand for a
-// hint.
-
-// I AM NOT DONE
+// `Vec<T>` is generic over the type `T`. In most cases, the compiler is able to
+// infer `T`, for example after pushing a value with a concrete type to the vector.
+// But in this exercise, the compiler needs some help through a type annotation.
 
 fn main() {
-    let mut shopping_list: Vec<?> = Vec::new();
-    shopping_list.push("milk");
+    // TODO: Fix the compiler error by annotating the type of the vector
+    // `Vec<T>`. Choose `T` as some integer type that can be created from
+    // `u8` and `i8`.
+    let mut numbers = Vec::new();
+
+    // Don't change the lines below.
+    let n1: u8 = 42;
+    numbers.push(n1.into());
+    let n2: i8 = -1;
+    numbers.push(n2.into());
+
+    println!("{numbers:?}");
 }
diff --git a/exercises/14_generics/generics2.rs b/exercises/14_generics/generics2.rs
index 074cd93..8908725 100644
--- a/exercises/14_generics/generics2.rs
+++ b/exercises/14_generics/generics2.rs
@@ -1,23 +1,20 @@
-// generics2.rs
-//
 // This powerful wrapper provides the ability to store a positive integer value.
-// Rewrite it using generics so that it supports wrapping ANY type.
-//
-// Execute `rustlings hint generics2` or use the `hint` watch subcommand for a
-// hint.
-
-// I AM NOT DONE
-
+// TODO: Rewrite it using a generic so that it supports wrapping ANY type.
 struct Wrapper {
     value: u32,
 }
 
+// TODO: Adapt the struct's implementation to be generic over the wrapped value.
 impl Wrapper {
-    pub fn new(value: u32) -> Self {
+    fn new(value: u32) -> Self {
         Wrapper { value }
     }
 }
 
+fn main() {
+    // You can optionally experiment here.
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;