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

5 files changed, 119 insertions, 0 deletions

diff --git a/solutions/06_move_semantics/move_semantics1.rs b/solutions/06_move_semantics/move_semantics1.rs
new file mode 100644
index 0000000..ac34e7a
--- /dev/null
+++ b/solutions/06_move_semantics/move_semantics1.rs
@@ -0,0 +1,25 @@
+fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
+    let mut vec = vec;
+    //  ^^^ added
+
+    vec.push(88);
+
+    vec
+}
+
+fn main() {
+    // You can optionally experiment here.
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn move_semantics1() {
+        let vec0 = vec![22, 44, 66];
+        let vec1 = fill_vec(vec0);
+        // `vec0` can't be accessed anymore because it is moved to `fill_vec`.
+        assert_eq!(vec1, vec![22, 44, 66, 88]);
+    }
+}
diff --git a/solutions/06_move_semantics/move_semantics2.rs b/solutions/06_move_semantics/move_semantics2.rs
new file mode 100644
index 0000000..7bcd33a
--- /dev/null
+++ b/solutions/06_move_semantics/move_semantics2.rs
@@ -0,0 +1,28 @@
+fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
+    let mut vec = vec;
+
+    vec.push(88);
+
+    vec
+}
+
+fn main() {
+    // You can optionally experiment here.
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn move_semantics2() {
+        let vec0 = vec![22, 44, 66];
+
+        // Cloning `vec0` so that the clone is moved into `fill_vec`, not `vec0`
+        // itself.
+        let vec1 = fill_vec(vec0.clone());
+
+        assert_eq!(vec0, [22, 44, 66]);
+        assert_eq!(vec1, [22, 44, 66, 88]);
+    }
+}
diff --git a/solutions/06_move_semantics/move_semantics3.rs b/solutions/06_move_semantics/move_semantics3.rs
new file mode 100644
index 0000000..7ba4006
--- /dev/null
+++ b/solutions/06_move_semantics/move_semantics3.rs
@@ -0,0 +1,22 @@
+fn fill_vec(mut vec: Vec<i32>) -> Vec<i32> {
+    //      ^^^ added
+    vec.push(88);
+
+    vec
+}
+
+fn main() {
+    // You can optionally experiment here.
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn move_semantics3() {
+        let vec0 = vec![22, 44, 66];
+        let vec1 = fill_vec(vec0);
+        assert_eq!(vec1, [22, 44, 66, 88]);
+    }
+}
diff --git a/solutions/06_move_semantics/move_semantics4.rs b/solutions/06_move_semantics/move_semantics4.rs
new file mode 100644
index 0000000..b7919ac
--- /dev/null
+++ b/solutions/06_move_semantics/move_semantics4.rs
@@ -0,0 +1,21 @@
+fn main() {
+    // You can optionally experiment here.
+}
+
+#[cfg(test)]
+mod tests {
+    // TODO: Fix the compiler errors only by reordering the lines in the test.
+    // Don't add, change or remove any line.
+    #[test]
+    fn move_semantics5() {
+        let mut x = 100;
+        let y = &mut x;
+        // `y` used here.
+        *y += 100;
+        // The mutable reference `y` is not used anymore,
+        // therefore a new reference can be created.
+        let z = &mut x;
+        *z += 1000;
+        assert_eq!(x, 1200);
+    }
+}
diff --git a/solutions/06_move_semantics/move_semantics5.rs b/solutions/06_move_semantics/move_semantics5.rs
new file mode 100644
index 0000000..678ec97
--- /dev/null
+++ b/solutions/06_move_semantics/move_semantics5.rs
@@ -0,0 +1,23 @@
+#![allow(clippy::ptr_arg)]
+
+fn main() {
+    let data = "Rust is great!".to_string();
+
+    get_char(&data);
+
+    string_uppercase(data);
+}
+
+// Borrows instead of taking ownership.
+// It is recommended to use `&str` instead of `&String` here. But this is
+// enough for now because we didn't handle strings yet.
+fn get_char(data: &String) -> char {
+    data.chars().last().unwrap()
+}
+
+// Takes ownership instead of borrowing.
+fn string_uppercase(mut data: String) {
+    data = data.to_uppercase();
+
+    println!("{data}");
+}