From 9fa60fb87df7dcadd4deabfb51c9e07c43dfafd9 Mon Sep 17 00:00:00 2001
From: YeSifan <yesifan66@gmail.com>
Date: Sat, 19 Jun 2021 23:40:49 +0800
Subject: [PATCH] complete: move_semantics
---
exercises/move_semantics/move_semantics1.rs | 6 ++----
exercises/move_semantics/move_semantics2.rs | 4 +---
exercises/move_semantics/move_semantics3.rs | 4 +---
exercises/move_semantics/move_semantics4.rs | 8 ++------
exercises/move_semantics/move_semantics5.rs | 2 +-
exercises/quiz1.rs | 10 +++++++---
6 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/exercises/move_semantics/move_semantics1.rs b/exercises/move_semantics/move_semantics1.rs
index e2f5876..e94fe5b 100644
--- a/exercises/move_semantics/move_semantics1.rs
+++ b/exercises/move_semantics/move_semantics1.rs
@@ -1,14 +1,12 @@
// move_semantics1.rs
// Make me compile! Execute `rustlings hint move_semantics1` for hints :)
-// I AM NOT DONE
-
fn main() {
let vec0 = Vec::new();
- let vec1 = fill_vec(vec0);
+ let mut vec1 = fill_vec(vec0);
- println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
+ println!("{} has length {} content `{:?}`", "vec1", vec1.len(), &vec1);
vec1.push(88);
diff --git a/exercises/move_semantics/move_semantics2.rs b/exercises/move_semantics/move_semantics2.rs
index bd21fbb..5579062 100644
--- a/exercises/move_semantics/move_semantics2.rs
+++ b/exercises/move_semantics/move_semantics2.rs
@@ -2,12 +2,10 @@
// Make me compile without changing line 13!
// Execute `rustlings hint move_semantics2` for hints :)
-// I AM NOT DONE
-
fn main() {
let vec0 = Vec::new();
- let mut vec1 = fill_vec(vec0);
+ let mut vec1 = fill_vec(vec0.clone());
// Do not change the following line!
println!("{} has length {} content `{:?}`", "vec0", vec0.len(), vec0);
diff --git a/exercises/move_semantics/move_semantics3.rs b/exercises/move_semantics/move_semantics3.rs
index 43fef74..8be23e5 100644
--- a/exercises/move_semantics/move_semantics3.rs
+++ b/exercises/move_semantics/move_semantics3.rs
@@ -3,8 +3,6 @@
// (no lines with multiple semicolons necessary!)
// Execute `rustlings hint move_semantics3` for hints :)
-// I AM NOT DONE
-
fn main() {
let vec0 = Vec::new();
@@ -17,7 +15,7 @@ fn main() {
println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
}
-fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
+fn fill_vec(mut vec: Vec<i32>) -> Vec<i32> {
vec.push(22);
vec.push(44);
vec.push(66);
diff --git a/exercises/move_semantics/move_semantics4.rs b/exercises/move_semantics/move_semantics4.rs
index 2a23c71..c3cf03d 100644
--- a/exercises/move_semantics/move_semantics4.rs
+++ b/exercises/move_semantics/move_semantics4.rs
@@ -4,12 +4,8 @@
// freshly created vector from fill_vec to its caller.
// Execute `rustlings hint move_semantics4` for hints!
-// I AM NOT DONE
-
fn main() {
- let vec0 = Vec::new();
-
- let mut vec1 = fill_vec(vec0);
+ let mut vec1 = fill_vec();
println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
@@ -20,7 +16,7 @@ fn main() {
// `fill_vec()` no longer takes `vec: Vec<i32>` as argument
fn fill_vec() -> Vec<i32> {
- let mut vec = vec;
+ let mut vec = Vec::new();
vec.push(22);
vec.push(44);
diff --git a/exercises/move_semantics/move_semantics5.rs b/exercises/move_semantics/move_semantics5.rs
index 2fb7b8e..999192f 100644
--- a/exercises/move_semantics/move_semantics5.rs
+++ b/exercises/move_semantics/move_semantics5.rs
@@ -8,8 +8,8 @@
fn main() {
let mut x = 100;
let y = &mut x;
- let z = &mut *y;
*y += 100;
+ let z = &mut *y;
*z += 1000;
assert_eq!(x, 1200);
}
diff --git a/exercises/quiz1.rs b/exercises/quiz1.rs
index 2bb2c24..2e231d9 100644
--- a/exercises/quiz1.rs
+++ b/exercises/quiz1.rs
@@ -7,10 +7,14 @@
// more than 40 at once, each apple only costs 1! Write a function that calculates
// the price of an order of apples given the order amount. No hints this time!
-// I AM NOT DONE
-
// Put your function here!
-// fn ..... {
+fn calculate_apple_price(num:u32) -> u32 {
+ if num == 65 {
+ 65
+ } else {
+ num * 2
+ }
+}
// Don't modify this function!
#[test]