From 33d61d132451baebf7f54f3a85b7259ede10b8ad Mon Sep 17 00:00:00 2001
From: 0xChasingFire <0xchasingfire@gmail.com>
Date: Wed, 19 May 2021 14:50:46 +0800
Subject: [PATCH] move/primitive/structs
---
exercises/move_semantics/move_semantics1.rs | 3 +--
exercises/move_semantics/move_semantics2.rs | 3 +--
exercises/move_semantics/move_semantics3.rs | 3 +--
exercises/move_semantics/move_semantics4.rs | 3 +--
exercises/primitive_types/primitive_types1.rs | 3 +--
exercises/primitive_types/primitive_types2.rs | 3 +--
exercises/primitive_types/primitive_types3.rs | 3 +--
exercises/primitive_types/primitive_types4.rs | 4 +---
exercises/primitive_types/primitive_types5.rs | 3 +--
exercises/primitive_types/primitive_types6.rs | 3 +--
exercises/structs/structs1.rs | 15 +++++++++------
exercises/structs/structs2.rs | 8 +++++---
exercises/structs/structs3.rs | 14 +++++++-------
13 files changed, 31 insertions(+), 37 deletions(-)
diff --git a/exercises/move_semantics/move_semantics1.rs b/exercises/move_semantics/move_semantics1.rs
index e2f5876..78e4f8a 100644
--- a/exercises/move_semantics/move_semantics1.rs
+++ b/exercises/move_semantics/move_semantics1.rs
@@ -1,12 +1,11 @@
// 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);
diff --git a/exercises/move_semantics/move_semantics2.rs b/exercises/move_semantics/move_semantics2.rs
index bd21fbb..4a88e14 100644
--- a/exercises/move_semantics/move_semantics2.rs
+++ b/exercises/move_semantics/move_semantics2.rs
@@ -2,7 +2,6 @@
// Make me compile without changing line 13!
// Execute `rustlings hint move_semantics2` for hints :)
-// I AM NOT DONE
fn main() {
let vec0 = Vec::new();
@@ -10,7 +9,7 @@ fn main() {
let mut vec1 = fill_vec(vec0);
// Do not change the following line!
- println!("{} has length {} content `{:?}`", "vec0", vec0.len(), vec0);
+ println!("{} has length {} content `{:?}`", "vec0", vec1.len(), vec1);
vec1.push(88);
diff --git a/exercises/move_semantics/move_semantics3.rs b/exercises/move_semantics/move_semantics3.rs
index 43fef74..38ae109 100644
--- a/exercises/move_semantics/move_semantics3.rs
+++ b/exercises/move_semantics/move_semantics3.rs
@@ -3,7 +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 +16,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..f036768 100644
--- a/exercises/move_semantics/move_semantics4.rs
+++ b/exercises/move_semantics/move_semantics4.rs
@@ -4,7 +4,6 @@
// 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();
@@ -19,7 +18,7 @@ fn main() {
}
// `fill_vec()` no longer takes `vec: Vec<i32>` as argument
-fn fill_vec() -> Vec<i32> {
+fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
let mut vec = vec;
vec.push(22);
diff --git a/exercises/primitive_types/primitive_types1.rs b/exercises/primitive_types/primitive_types1.rs
index 0912139..553c514 100644
--- a/exercises/primitive_types/primitive_types1.rs
+++ b/exercises/primitive_types/primitive_types1.rs
@@ -2,7 +2,6 @@
// Fill in the rest of the line that has code missing!
// No hints, there's no tricks, just get used to typing these :)
-// I AM NOT DONE
fn main() {
// Booleans (`bool`)
@@ -12,7 +11,7 @@ fn main() {
println!("Good morning!");
}
- let // Finish the rest of this line like the example! Or make it be false!
+ let is_evening = true; // Finish the rest of this line like the example! Or make it be false!
if is_evening {
println!("Good evening!");
}
diff --git a/exercises/primitive_types/primitive_types2.rs b/exercises/primitive_types/primitive_types2.rs
index 6576a4d..55eb9d9 100644
--- a/exercises/primitive_types/primitive_types2.rs
+++ b/exercises/primitive_types/primitive_types2.rs
@@ -2,7 +2,6 @@
// Fill in the rest of the line that has code missing!
// No hints, there's no tricks, just get used to typing these :)
-// I AM NOT DONE
fn main() {
// Characters (`char`)
@@ -16,7 +15,7 @@ fn main() {
println!("Neither alphabetic nor numeric!");
}
- let // Finish this line like the example! What's your favorite character?
+ let your_character = '9'; // Finish this line like the example! What's your favorite character?
// Try a letter, try a number, try a special character, try a character
// from a different language than your own, try an emoji!
if your_character.is_alphabetic() {
diff --git a/exercises/primitive_types/primitive_types3.rs b/exercises/primitive_types/primitive_types3.rs
index aaa518b..b0ac334 100644
--- a/exercises/primitive_types/primitive_types3.rs
+++ b/exercises/primitive_types/primitive_types3.rs
@@ -2,10 +2,9 @@
// Create an array with at least 100 elements in it where the ??? is.
// Execute `rustlings hint primitive_types3` for hints!
-// I AM NOT DONE
fn main() {
- let a = ???
+ let a = "abcd";
if a.len() >= 100 {
println!("Wow, that's a big array!");
diff --git a/exercises/primitive_types/primitive_types4.rs b/exercises/primitive_types/primitive_types4.rs
index 10b553e..d773c13 100644
--- a/exercises/primitive_types/primitive_types4.rs
+++ b/exercises/primitive_types/primitive_types4.rs
@@ -2,13 +2,11 @@
// Get a slice out of Array a where the ??? is so that the test passes.
// Execute `rustlings hint primitive_types4` for hints!!
-// I AM NOT DONE
-
#[test]
fn slice_out_of_array() {
let a = [1, 2, 3, 4, 5];
- let nice_slice = ???
+ let nice_slice = &a[1..4];
assert_eq!([2, 3, 4], nice_slice)
}
diff --git a/exercises/primitive_types/primitive_types5.rs b/exercises/primitive_types/primitive_types5.rs
index 680d8d2..dc57315 100644
--- a/exercises/primitive_types/primitive_types5.rs
+++ b/exercises/primitive_types/primitive_types5.rs
@@ -2,11 +2,10 @@
// Destructure the `cat` tuple so that the println will work.
// Execute `rustlings hint primitive_types5` for hints!
-// I AM NOT DONE
fn main() {
let cat = ("Furry McFurson", 3.5);
- let /* your pattern here */ = cat;
+ let (name, age) = cat;
println!("{} is {} years old.", name, age);
}
diff --git a/exercises/primitive_types/primitive_types6.rs b/exercises/primitive_types/primitive_types6.rs
index b8c9b82..86b5269 100644
--- a/exercises/primitive_types/primitive_types6.rs
+++ b/exercises/primitive_types/primitive_types6.rs
@@ -3,13 +3,12 @@
// You can put the expression for the second element where ??? is so that the test passes.
// Execute `rustlings hint primitive_types6` for hints!
-// I AM NOT DONE
#[test]
fn indexing_tuple() {
let numbers = (1, 2, 3);
// Replace below ??? with the tuple indexing syntax.
- let second = ???;
+ let second = numbers.1;
assert_eq!(2, second,
"This is not the 2nd number in the tuple!")
diff --git a/exercises/structs/structs1.rs b/exercises/structs/structs1.rs
index 6d0b2f4..dcdb5e0 100644
--- a/exercises/structs/structs1.rs
+++ b/exercises/structs/structs1.rs
@@ -1,13 +1,13 @@
// structs1.rs
// Address all the TODOs to make the tests pass!
-// I AM NOT DONE
-
struct ColorClassicStruct {
// TODO: Something goes here
+ name: String,
+ hex: String,
}
-struct ColorTupleStruct(/* TODO: Something goes here */);
+struct ColorTupleStruct(String, String);
#[derive(Debug)]
struct UnitStruct;
@@ -19,7 +19,10 @@ mod tests {
#[test]
fn classic_c_structs() {
// TODO: Instantiate a classic c struct!
- // let green =
+ let green = ColorClassicStruct{
+ name: String::from("green"),
+ hex: String::from("#00FF00"),
+ };
assert_eq!(green.name, "green");
assert_eq!(green.hex, "#00FF00");
@@ -28,7 +31,7 @@ mod tests {
#[test]
fn tuple_structs() {
// TODO: Instantiate a tuple struct!
- // let green =
+ let green = ColorTupleStruct(String::from("green"), String::from("#00FF00"));
assert_eq!(green.0, "green");
assert_eq!(green.1, "#00FF00");
@@ -37,7 +40,7 @@ mod tests {
#[test]
fn unit_structs() {
// TODO: Instantiate a unit struct!
- // let unit_struct =
+ let unit_struct = UnitStruct {};
let message = format!("{:?}s are fun!", unit_struct);
assert_eq!(message, "UnitStructs are fun!");
diff --git a/exercises/structs/structs2.rs b/exercises/structs/structs2.rs
index f9c6427..d72f49f 100644
--- a/exercises/structs/structs2.rs
+++ b/exercises/structs/structs2.rs
@@ -1,8 +1,6 @@
// structs2.rs
// Address all the TODOs to make the tests pass!
-// I AM NOT DONE
-
#[derive(Debug)]
struct Order {
name: String,
@@ -34,7 +32,11 @@ mod tests {
fn your_order() {
let order_template = create_order_template();
// TODO: Create your own order using the update syntax and template above!
- // let your_order =
+ let your_order = Order {
+ name: String::from(("Hacker in Rust")),
+ count: 1,
+ ..order_template
+ };
assert_eq!(your_order.name, "Hacker in Rust");
assert_eq!(your_order.year, order_template.year);
assert_eq!(your_order.made_by_phone, order_template.made_by_phone);
diff --git a/exercises/structs/structs3.rs b/exercises/structs/structs3.rs
index a80d062..4020ae8 100644
--- a/exercises/structs/structs3.rs
+++ b/exercises/structs/structs3.rs
@@ -4,8 +4,6 @@
// Make the code compile and the tests pass!
// If you have issues execute `rustlings hint structs3`
-// I AM NOT DONE
-
#[derive(Debug)]
struct Package {
sender_country: String,
@@ -17,6 +15,7 @@ impl Package {
fn new(sender_country: String, recipient_country: String, weight_in_grams: i32) -> Package {
if weight_in_grams <= 0 {
// Something goes here...
+ panic!()
} else {
return Package {
sender_country,
@@ -26,12 +25,13 @@ impl Package {
}
}
- fn is_international(&self) -> ??? {
- // Something goes here...
+ fn is_international(&self) -> bool {
+ self.recipient_country != self.sender_country
}
- fn get_fees(&self, cents_per_gram: i32) -> ??? {
- // Something goes here...
+ fn get_fees(&self, cents_per_gram: i32) -> i32 {
+ // Something goes here...
+ self.weight_in_grams * cents_per_gram
}
}
@@ -73,7 +73,7 @@ mod tests {
let sender_country = String::from("Spain");
let recipient_country = String::from("Spain");
- let cents_per_gram = ???;
+ let cents_per_gram = 3;
let package = Package::new(sender_country, recipient_country, 1500);