From b73170381a9569f496e5023dea50fc05e174f51e Mon Sep 17 00:00:00 2001 From: chping Date: Sun, 18 Feb 2024 16:33:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=88=B0=E7=AC=AC12=E7=AB=A0?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- exercises/00_intro/intro1.rs | 2 +- exercises/00_intro/intro2.rs | 4 +-- exercises/01_variables/variables1.rs | 4 +-- exercises/01_variables/variables2.rs | 4 +-- exercises/01_variables/variables3.rs | 4 +-- exercises/01_variables/variables4.rs | 4 +-- exercises/01_variables/variables5.rs | 3 +- exercises/01_variables/variables6.rs | 3 +- exercises/02_functions/functions1.rs | 6 +++- exercises/02_functions/functions2.rs | 4 +-- exercises/02_functions/functions3.rs | 4 +-- exercises/02_functions/functions4.rs | 4 +-- exercises/02_functions/functions5.rs | 4 +-- exercises/03_if/if1.rs | 9 +++++- exercises/03_if/if2.rs | 7 ++-- exercises/03_if/if3.rs | 15 +++++---- .../04_primitive_types/primitive_types1.rs | 4 +-- .../04_primitive_types/primitive_types2.rs | 5 +-- .../04_primitive_types/primitive_types3.rs | 6 ++-- .../04_primitive_types/primitive_types4.rs | 5 +-- .../04_primitive_types/primitive_types5.rs | 4 +-- .../04_primitive_types/primitive_types6.rs | 4 +-- exercises/05_vecs/vecs1.rs | 4 +-- exercises/05_vecs/vecs2.rs | 6 ++-- .../06_move_semantics/move_semantics1.rs | 3 +- .../06_move_semantics/move_semantics2.rs | 4 +-- .../06_move_semantics/move_semantics3.rs | 10 +++--- .../06_move_semantics/move_semantics4.rs | 8 ++--- .../06_move_semantics/move_semantics5.rs | 6 ++-- .../06_move_semantics/move_semantics6.rs | 12 +++---- exercises/07_structs/structs1.rs | 16 +++++++--- exercises/07_structs/structs2.rs | 12 +++++-- exercises/07_structs/structs3.rs | 16 +++++++--- exercises/08_enums/enums1.rs | 6 +++- exercises/08_enums/enums2.rs | 6 +++- exercises/08_enums/enums3.rs | 14 +++++--- exercises/09_strings/strings1.rs | 3 +- exercises/09_strings/strings2.rs | 4 +-- exercises/09_strings/strings3.rs | 10 +++--- exercises/09_strings/strings4.rs | 21 ++++++------ exercises/10_modules/modules1.rs | 4 +-- exercises/10_modules/modules2.rs | 6 ++-- exercises/10_modules/modules3.rs | 5 +-- exercises/11_hashmaps/hashmaps1.rs | 8 +++-- exercises/11_hashmaps/hashmaps2.rs | 9 +++++- exercises/11_hashmaps/hashmaps3.rs | 18 ++++++++++- exercises/12_options/options1.rs | 14 ++++++-- exercises/12_options/options2.rs | 17 ++++++---- exercises/12_options/options3.rs | 4 +-- exercises/13_error_handling/errors1.rs | 15 ++++++--- exercises/quiz1.rs | 10 ++++-- exercises/quiz2.rs | 32 ++++++++++++++++--- 52 files changed, 263 insertions(+), 149 deletions(-) diff --git a/exercises/00_intro/intro1.rs b/exercises/00_intro/intro1.rs index 5dd18b45..8e9e24f8 100644 --- a/exercises/00_intro/intro1.rs +++ b/exercises/00_intro/intro1.rs @@ -13,7 +13,7 @@ // Execute `rustlings hint intro1` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + fn main() { println!("Hello and"); diff --git a/exercises/00_intro/intro2.rs b/exercises/00_intro/intro2.rs index a28ad3dc..81ccb6df 100644 --- a/exercises/00_intro/intro2.rs +++ b/exercises/00_intro/intro2.rs @@ -5,8 +5,8 @@ // Execute `rustlings hint intro2` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + fn main() { - printline!("Hello there!") + println!("Hello there!") } diff --git a/exercises/01_variables/variables1.rs b/exercises/01_variables/variables1.rs index b3e089a5..15186bf1 100644 --- a/exercises/01_variables/variables1.rs +++ b/exercises/01_variables/variables1.rs @@ -5,9 +5,9 @@ // Execute `rustlings hint variables1` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + fn main() { - x = 5; + let x = 5; println!("x has the value {}", x); } diff --git a/exercises/01_variables/variables2.rs b/exercises/01_variables/variables2.rs index e1c23edf..474ee075 100644 --- a/exercises/01_variables/variables2.rs +++ b/exercises/01_variables/variables2.rs @@ -3,10 +3,10 @@ // Execute `rustlings hint variables2` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + fn main() { - let x; + let x =10; if x == 10 { println!("x is ten!"); } else { diff --git a/exercises/01_variables/variables3.rs b/exercises/01_variables/variables3.rs index 86bed419..3935a112 100644 --- a/exercises/01_variables/variables3.rs +++ b/exercises/01_variables/variables3.rs @@ -3,9 +3,9 @@ // Execute `rustlings hint variables3` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + fn main() { - let x: i32; + let x: i32 =0; println!("Number {}", x); } diff --git a/exercises/01_variables/variables4.rs b/exercises/01_variables/variables4.rs index 5394f394..c781dbfb 100644 --- a/exercises/01_variables/variables4.rs +++ b/exercises/01_variables/variables4.rs @@ -3,11 +3,11 @@ // Execute `rustlings hint variables4` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + fn main() { let x = 3; println!("Number {}", x); - x = 5; // don't change this line + let x = 5; // don't change this line println!("Number {}", x); } diff --git a/exercises/01_variables/variables5.rs b/exercises/01_variables/variables5.rs index a29b38be..2a312acb 100644 --- a/exercises/01_variables/variables5.rs +++ b/exercises/01_variables/variables5.rs @@ -3,11 +3,10 @@ // Execute `rustlings hint variables5` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE fn main() { let number = "T-H-R-E-E"; // don't change this line println!("Spell a Number : {}", number); - number = 3; // don't rename this variable + let number = 3; // don't rename this variable println!("Number plus two is : {}", number + 2); } diff --git a/exercises/01_variables/variables6.rs b/exercises/01_variables/variables6.rs index 853183ba..53ebf536 100644 --- a/exercises/01_variables/variables6.rs +++ b/exercises/01_variables/variables6.rs @@ -3,9 +3,8 @@ // Execute `rustlings hint variables6` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE -const NUMBER = 3; +const NUMBER:i32 = 3; fn main() { println!("Number {}", NUMBER); } diff --git a/exercises/02_functions/functions1.rs b/exercises/02_functions/functions1.rs index 40ed9a07..8e6889b4 100644 --- a/exercises/02_functions/functions1.rs +++ b/exercises/02_functions/functions1.rs @@ -3,8 +3,12 @@ // Execute `rustlings hint functions1` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + fn main() { call_me(); } + +fn call_me(){ + println!("call me"); +} diff --git a/exercises/02_functions/functions2.rs b/exercises/02_functions/functions2.rs index 5154f34d..a02fadc3 100644 --- a/exercises/02_functions/functions2.rs +++ b/exercises/02_functions/functions2.rs @@ -3,13 +3,13 @@ // Execute `rustlings hint functions2` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + fn main() { call_me(3); } -fn call_me(num:) { +fn call_me(num:i32) { for i in 0..num { println!("Ring! Call number {}", i + 1); } diff --git a/exercises/02_functions/functions3.rs b/exercises/02_functions/functions3.rs index 74f44d6d..59f5d298 100644 --- a/exercises/02_functions/functions3.rs +++ b/exercises/02_functions/functions3.rs @@ -3,10 +3,10 @@ // Execute `rustlings hint functions3` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + fn main() { - call_me(); + call_me(10); } fn call_me(num: u32) { diff --git a/exercises/02_functions/functions4.rs b/exercises/02_functions/functions4.rs index 77c4b2aa..104aad9c 100644 --- a/exercises/02_functions/functions4.rs +++ b/exercises/02_functions/functions4.rs @@ -8,14 +8,14 @@ // Execute `rustlings hint functions4` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + fn main() { let original_price = 51; println!("Your sale price is {}", sale_price(original_price)); } -fn sale_price(price: i32) -> { +fn sale_price(price: i32) -> i32{ if is_even(price) { price - 10 } else { diff --git a/exercises/02_functions/functions5.rs b/exercises/02_functions/functions5.rs index f1b63f48..3608bf0f 100644 --- a/exercises/02_functions/functions5.rs +++ b/exercises/02_functions/functions5.rs @@ -3,7 +3,7 @@ // Execute `rustlings hint functions5` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + fn main() { let answer = square(3); @@ -11,5 +11,5 @@ fn main() { } fn square(num: i32) -> i32 { - num * num; + num * num } diff --git a/exercises/03_if/if1.rs b/exercises/03_if/if1.rs index 4734d78f..c1d27c4b 100644 --- a/exercises/03_if/if1.rs +++ b/exercises/03_if/if1.rs @@ -2,13 +2,20 @@ // // Execute `rustlings hint if1` or use the `hint` watch subcommand for a hint. -// I AM NOT DONE + pub fn bigger(a: i32, b: i32) -> i32 { // Complete this function to return the bigger number! // Do not use: // - another function call // - additional variables + if a > b{ + return a; + }else if b >a{ + return b; + }else { + return a; + } } // Don't mind this for now :) diff --git a/exercises/03_if/if2.rs b/exercises/03_if/if2.rs index f512f13f..1f49e829 100644 --- a/exercises/03_if/if2.rs +++ b/exercises/03_if/if2.rs @@ -5,13 +5,14 @@ // // Execute `rustlings hint if2` or use the `hint` watch subcommand for a hint. -// I AM NOT DONE pub fn foo_if_fizz(fizzish: &str) -> &str { if fizzish == "fizz" { "foo" - } else { - 1 + } else if fizzish == "fuzz" { + "bar" + }else { + "baz" } } diff --git a/exercises/03_if/if3.rs b/exercises/03_if/if3.rs index 16962740..8290cf58 100644 --- a/exercises/03_if/if3.rs +++ b/exercises/03_if/if3.rs @@ -2,17 +2,17 @@ // // Execute `rustlings hint if3` or use the `hint` watch subcommand for a hint. -// I AM NOT DONE - pub fn animal_habitat(animal: &str) -> &'static str { let identifier = if animal == "crab" { 1 } else if animal == "gopher" { - 2.0 + 2 } else if animal == "snake" { 3 - } else { - "Unknown" + } else if animal == "crab"{ + 4 + }else { + 5 }; // DO NOT CHANGE THIS STATEMENT BELOW @@ -22,7 +22,10 @@ pub fn animal_habitat(animal: &str) -> &'static str { "Burrow" } else if identifier == 3 { "Desert" - } else { + }else if identifier ==4{ + "Beach" + } + else { "Unknown" }; diff --git a/exercises/04_primitive_types/primitive_types1.rs b/exercises/04_primitive_types/primitive_types1.rs index 36633400..5d6d46b1 100644 --- a/exercises/04_primitive_types/primitive_types1.rs +++ b/exercises/04_primitive_types/primitive_types1.rs @@ -3,7 +3,7 @@ // 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`) @@ -13,7 +13,7 @@ fn main() { println!("Good morning!"); } - let // Finish the rest of this line like the example! Or make it be false! + let is_evening = false;// Finish the rest of this line like the example! Or make it be false! if is_evening { println!("Good evening!"); } diff --git a/exercises/04_primitive_types/primitive_types2.rs b/exercises/04_primitive_types/primitive_types2.rs index f1616ed3..e0e87bf1 100644 --- a/exercises/04_primitive_types/primitive_types2.rs +++ b/exercises/04_primitive_types/primitive_types2.rs @@ -2,9 +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`) @@ -19,7 +16,7 @@ fn main() { println!("Neither alphabetic nor numeric!"); } - let // Finish this line like the example! What's your favorite character? + let your_character ='q';// 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/04_primitive_types/primitive_types3.rs b/exercises/04_primitive_types/primitive_types3.rs index 8b0de44e..0a0cd894 100644 --- a/exercises/04_primitive_types/primitive_types3.rs +++ b/exercises/04_primitive_types/primitive_types3.rs @@ -5,10 +5,12 @@ // Execute `rustlings hint primitive_types3` or use the `hint` watch subcommand // for a hint. -// I AM NOT DONE + fn main() { - let a = ??? + let a =[0;100]; + let a = [255;100]; //生成数组长度为100，默认值为255的数组 + println!("{:?}",a); if a.len() >= 100 { println!("Wow, that's a big array!"); diff --git a/exercises/04_primitive_types/primitive_types4.rs b/exercises/04_primitive_types/primitive_types4.rs index d44d8776..3ad93722 100644 --- a/exercises/04_primitive_types/primitive_types4.rs +++ b/exercises/04_primitive_types/primitive_types4.rs @@ -5,13 +5,14 @@ // Execute `rustlings hint primitive_types4` or use the `hint` watch subcommand // for a hint. -// 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..a.len()-1]; + let nice_slice = &a[1..4]; assert_eq!([2, 3, 4], nice_slice) } diff --git a/exercises/04_primitive_types/primitive_types5.rs b/exercises/04_primitive_types/primitive_types5.rs index f646986e..497858a8 100644 --- a/exercises/04_primitive_types/primitive_types5.rs +++ b/exercises/04_primitive_types/primitive_types5.rs @@ -5,11 +5,11 @@ // Execute `rustlings hint primitive_types5` or use the `hint` watch subcommand // for a hint. -// 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/04_primitive_types/primitive_types6.rs b/exercises/04_primitive_types/primitive_types6.rs index 07cc46c6..0b71526f 100644 --- a/exercises/04_primitive_types/primitive_types6.rs +++ b/exercises/04_primitive_types/primitive_types6.rs @@ -6,13 +6,13 @@ // Execute `rustlings hint primitive_types6` or use the `hint` watch subcommand // for a hint. -// 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/05_vecs/vecs1.rs b/exercises/05_vecs/vecs1.rs index 65b7a7f8..787146b7 100644 --- a/exercises/05_vecs/vecs1.rs +++ b/exercises/05_vecs/vecs1.rs @@ -7,11 +7,11 @@ // // Execute `rustlings hint vecs1` or use the `hint` watch subcommand for a hint. -// I AM NOT DONE + fn array_and_vec() -> ([i32; 4], Vec) { let a = [10, 20, 30, 40]; // a plain array - let v = // TODO: declare your vector here with the macro for vectors + let v = vec![10, 20, 30, 40]; (a, v) } diff --git a/exercises/05_vecs/vecs2.rs b/exercises/05_vecs/vecs2.rs index e92c970a..2b3a2cc7 100644 --- a/exercises/05_vecs/vecs2.rs +++ b/exercises/05_vecs/vecs2.rs @@ -7,13 +7,13 @@ // // Execute `rustlings hint vecs2` or use the `hint` watch subcommand for a hint. -// I AM NOT DONE + fn vec_loop(mut v: Vec) -> Vec { for element in v.iter_mut() { // TODO: Fill this up so that each element in the Vec `v` is // multiplied by 2. - ??? + *element= *element*2; } // At this point, `v` should be equal to [4, 8, 12, 16, 20]. @@ -24,7 +24,7 @@ fn vec_map(v: &Vec) -> Vec { v.iter().map(|element| { // TODO: Do the same thing as above - but instead of mutating the // Vec, you can just return the new number! - ??? + element*2 }).collect() } diff --git a/exercises/06_move_semantics/move_semantics1.rs b/exercises/06_move_semantics/move_semantics1.rs index e0639375..a925ce29 100644 --- a/exercises/06_move_semantics/move_semantics1.rs +++ b/exercises/06_move_semantics/move_semantics1.rs @@ -3,7 +3,6 @@ // Execute `rustlings hint move_semantics1` or use the `hint` watch subcommand // for a hint. -// I AM NOT DONE #[test] fn main() { @@ -15,7 +14,7 @@ fn main() { } fn fill_vec(vec: Vec) -> Vec { - let vec = vec; + let mut vec = vec; vec.push(88); diff --git a/exercises/06_move_semantics/move_semantics2.rs b/exercises/06_move_semantics/move_semantics2.rs index baf6bcc9..c06972f7 100644 --- a/exercises/06_move_semantics/move_semantics2.rs +++ b/exercises/06_move_semantics/move_semantics2.rs @@ -5,13 +5,13 @@ // Execute `rustlings hint move_semantics2` or use the `hint` watch subcommand // for a hint. -// I AM NOT DONE + #[test] fn main() { let vec0 = vec![22, 44, 66]; - let mut vec1 = fill_vec(vec0); + let mut vec1 = fill_vec(vec0.clone()); assert_eq!(vec0, vec![22, 44, 66]); assert_eq!(vec1, vec![22, 44, 66, 88]); diff --git a/exercises/06_move_semantics/move_semantics3.rs b/exercises/06_move_semantics/move_semantics3.rs index 7af9e694..40dfa977 100644 --- a/exercises/06_move_semantics/move_semantics3.rs +++ b/exercises/06_move_semantics/move_semantics3.rs @@ -6,19 +6,19 @@ // Execute `rustlings hint move_semantics3` or use the `hint` watch subcommand // for a hint. -// I AM NOT DONE + #[test] fn main() { - let vec0 = vec![22, 44, 66]; + let mut vec0 = vec![22, 44, 66]; - let mut vec1 = fill_vec(vec0); + let mut vec1 = fill_vec(&mut vec0); assert_eq!(vec1, vec![22, 44, 66, 88]); } -fn fill_vec(vec: Vec) -> Vec { +fn fill_vec(vec: &mut Vec) -> Vec { vec.push(88); - vec + vec.to_vec() } diff --git a/exercises/06_move_semantics/move_semantics4.rs b/exercises/06_move_semantics/move_semantics4.rs index 80b49dba..b8c686cb 100644 --- a/exercises/06_move_semantics/move_semantics4.rs +++ b/exercises/06_move_semantics/move_semantics4.rs @@ -7,13 +7,13 @@ // Execute `rustlings hint move_semantics4` or use the `hint` watch subcommand // for a hint. -// I AM NOT DONE + #[test] fn main() { - let vec0 = vec![22, 44, 66]; + // let vec0 = vec![22, 44, 66]; - let mut vec1 = fill_vec(vec0); + let mut vec1 = fill_vec(); assert_eq!(vec1, vec![22, 44, 66, 88]); } @@ -21,7 +21,7 @@ fn main() { // `fill_vec()` no longer takes `vec: Vec` as argument - don't change this! fn fill_vec() -> Vec { // Instead, let's create and fill the Vec in here - how do you do that? - let mut vec = vec; + let mut vec = vec![22, 44, 66]; vec.push(88); diff --git a/exercises/06_move_semantics/move_semantics5.rs b/exercises/06_move_semantics/move_semantics5.rs index 267bdccc..22284331 100644 --- a/exercises/06_move_semantics/move_semantics5.rs +++ b/exercises/06_move_semantics/move_semantics5.rs @@ -6,14 +6,14 @@ // Execute `rustlings hint move_semantics5` or use the `hint` watch subcommand // for a hint. -// I AM NOT DONE + #[test] fn main() { let mut x = 100; let y = &mut x; - let z = &mut x; + // let z = &mut x; *y += 100; - *z += 1000; + *y += 1000; assert_eq!(x, 1200); } diff --git a/exercises/06_move_semantics/move_semantics6.rs b/exercises/06_move_semantics/move_semantics6.rs index cace4ca6..31dcc050 100644 --- a/exercises/06_move_semantics/move_semantics6.rs +++ b/exercises/06_move_semantics/move_semantics6.rs @@ -5,24 +5,24 @@ // Execute `rustlings hint move_semantics6` or use the `hint` watch subcommand // for a hint. -// I AM NOT DONE + fn main() { let data = "Rust is great!".to_string(); - get_char(data); + get_char(&data); - string_uppercase(&data); + string_uppercase(data); } // Should not take ownership -fn get_char(data: String) -> char { +fn get_char(data: &String) -> char { //不应该取得所有权 data.chars().last().unwrap() } // Should take ownership -fn string_uppercase(mut data: &String) { - data = &data.to_uppercase(); +fn string_uppercase(mut data: String) { //取得所有权 + data = data.to_uppercase(); println!("{}", data); } diff --git a/exercises/07_structs/structs1.rs b/exercises/07_structs/structs1.rs index 5fa5821c..a3c4e64b 100644 --- a/exercises/07_structs/structs1.rs +++ b/exercises/07_structs/structs1.rs @@ -5,13 +5,15 @@ // Execute `rustlings hint structs1` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE struct ColorClassicStruct { // TODO: Something goes here + red:i32, + green:i32, + blue:i32 } -struct ColorTupleStruct(/* TODO: Something goes here */); +struct ColorTupleStruct(i32,i32,i32/* TODO: Something goes here */); #[derive(Debug)] struct UnitLikeStruct; @@ -23,7 +25,11 @@ mod tests { #[test] fn classic_c_structs() { // TODO: Instantiate a classic c struct! - // let green = + let green =ColorClassicStruct{ + red:0, + green:255, + blue:0 + }; assert_eq!(green.red, 0); assert_eq!(green.green, 255); @@ -33,7 +39,7 @@ mod tests { #[test] fn tuple_structs() { // TODO: Instantiate a tuple struct! - // let green = + let green =ColorTupleStruct(0,255,0); assert_eq!(green.0, 0); assert_eq!(green.1, 255); @@ -43,7 +49,7 @@ mod tests { #[test] fn unit_structs() { // TODO: Instantiate a unit-like struct! - // let unit_like_struct = + let unit_like_struct =UnitLikeStruct; let message = format!("{:?}s are fun!", unit_like_struct); assert_eq!(message, "UnitLikeStructs are fun!"); diff --git a/exercises/07_structs/structs2.rs b/exercises/07_structs/structs2.rs index 328567f0..59f7ff50 100644 --- a/exercises/07_structs/structs2.rs +++ b/exercises/07_structs/structs2.rs @@ -5,7 +5,7 @@ // Execute `rustlings hint structs2` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + #[derive(Debug)] struct Order { @@ -38,7 +38,15 @@ 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"), + year: 2019, + made_by_phone: false, + made_by_mobile: false, + made_by_email: true, + item_number: 123, + count: 1, + }; 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/07_structs/structs3.rs b/exercises/07_structs/structs3.rs index 7cda5af1..aa4a0cd8 100644 --- a/exercises/07_structs/structs3.rs +++ b/exercises/07_structs/structs3.rs @@ -7,7 +7,7 @@ // Execute `rustlings hint structs3` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + #[derive(Debug)] struct Package { @@ -31,12 +31,18 @@ impl Package { } } - fn is_international(&self) -> ??? { + fn is_international(&self) -> bool { // Something goes here... + if &self.sender_country == &self.recipient_country{ + return false ; + }else { + return true; + } } - fn get_fees(&self, cents_per_gram: u32) -> ??? { + fn get_fees(&self, cents_per_gram: u32) -> u32{ // Something goes here... + &self.weight_in_grams* cents_per_gram } } @@ -55,8 +61,8 @@ mod tests { #[test] fn create_international_package() { - let sender_country = String::from("Spain"); - let recipient_country = String::from("Russia"); + let sender_country = String::from("Spain"); //发件国家 + let recipient_country = String::from("Russia"); //收件国家 let package = Package::new(sender_country, recipient_country, 1200); diff --git a/exercises/08_enums/enums1.rs b/exercises/08_enums/enums1.rs index 25525b25..062dc445 100644 --- a/exercises/08_enums/enums1.rs +++ b/exercises/08_enums/enums1.rs @@ -2,11 +2,15 @@ // // No hints this time! ;) -// I AM NOT DONE #[derive(Debug)] enum Message { // TODO: define a few types of messages as used below + Quit, + Echo, + Move, + ChangeColor + } fn main() { diff --git a/exercises/08_enums/enums2.rs b/exercises/08_enums/enums2.rs index df93fe0f..a3a666dd 100644 --- a/exercises/08_enums/enums2.rs +++ b/exercises/08_enums/enums2.rs @@ -3,11 +3,15 @@ // Execute `rustlings hint enums2` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + #[derive(Debug)] enum Message { // TODO: define the different variants used below + Move{x:i32,y:i32}, + Echo(String), + ChangeColor(i32,i32,i32), + Quit } impl Message { diff --git a/exercises/08_enums/enums3.rs b/exercises/08_enums/enums3.rs index 92d18c46..9bfdc361 100644 --- a/exercises/08_enums/enums3.rs +++ b/exercises/08_enums/enums3.rs @@ -5,10 +5,14 @@ // Execute `rustlings hint enums3` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + enum Message { // TODO: implement the message variant types based on their usage below + Move(Point), + Echo(String), + ChangeColor(i32,i32,i32), + Quit } struct Point { @@ -54,10 +58,10 @@ mod tests { #[test] fn test_match_message_call() { let mut state = State { - quit: false, - position: Point { x: 0, y: 0 }, - color: (0, 0, 0), - message: "hello world".to_string(), + quit: true, + position: Point { x: 10, y: 15}, + color: (255, 0, 255), + message: "Hello world!".to_string(), }; state.process(Message::ChangeColor(255, 0, 255)); state.process(Message::Echo(String::from("Hello world!"))); diff --git a/exercises/09_strings/strings1.rs b/exercises/09_strings/strings1.rs index f50e1fa9..5d48b91b 100644 --- a/exercises/09_strings/strings1.rs +++ b/exercises/09_strings/strings1.rs @@ -5,7 +5,6 @@ // Execute `rustlings hint strings1` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE fn main() { let answer = current_favorite_color(); @@ -13,5 +12,5 @@ fn main() { } fn current_favorite_color() -> String { - "blue" + "blue".to_string() } diff --git a/exercises/09_strings/strings2.rs b/exercises/09_strings/strings2.rs index 4d95d16a..81cb0bac 100644 --- a/exercises/09_strings/strings2.rs +++ b/exercises/09_strings/strings2.rs @@ -5,11 +5,11 @@ // Execute `rustlings hint strings2` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + fn main() { let word = String::from("green"); // Try not changing this line :) - if is_a_color_word(word) { + if is_a_color_word(&word) { println!("That is a color word I know!"); } else { println!("That is not a color word I know."); diff --git a/exercises/09_strings/strings3.rs b/exercises/09_strings/strings3.rs index b29f9325..95b2c5a7 100644 --- a/exercises/09_strings/strings3.rs +++ b/exercises/09_strings/strings3.rs @@ -3,21 +3,21 @@ // Execute `rustlings hint strings3` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + fn trim_me(input: &str) -> String { // TODO: Remove whitespace from both ends of a string! - ??? + input.trim().to_string() } fn compose_me(input: &str) -> String { - // TODO: Add " world!" to the string! There's multiple ways to do this! - ??? + // TODO: Add " world!" to the string! There's multiple ways to do this + input.to_owned() +" world!" } fn replace_me(input: &str) -> String { // TODO: Replace "cars" in the string with "balloons"! - ??? + input.replace("cars","balloons").to_string() } #[cfg(test)] diff --git a/exercises/09_strings/strings4.rs b/exercises/09_strings/strings4.rs index e8c54acc..d603c3c2 100644 --- a/exercises/09_strings/strings4.rs +++ b/exercises/09_strings/strings4.rs @@ -7,7 +7,6 @@ // // No hints this time! -// I AM NOT DONE fn string_slice(arg: &str) { println!("{}", arg); @@ -17,14 +16,14 @@ fn string(arg: String) { } fn main() { - ???("blue"); - ???("red".to_string()); - ???(String::from("hi")); - ???("rust is fun!".to_owned()); - ???("nice weather".into()); - ???(format!("Interpolation {}", "Station")); - ???(&String::from("abc")[0..1]); - ???(" hello there ".trim()); - ???("Happy Monday!".to_string().replace("Mon", "Tues")); - ???("mY sHiFt KeY iS sTiCkY".to_lowercase()); + string_slice("blue"); + string("red".to_string()); + string(String::from("hi")); + string("rust is fun!".to_owned()); + string_slice("nice weather".into()); + string(format!("Interpolation {}", "Station")); + string_slice(&String::from("abc")[0..1]); + string_slice(" hello there ".trim()); + string("Happy Monday!".to_string().replace("Mon", "Tues")); + string("mY sHiFt KeY iS sTiCkY".to_lowercase()); } diff --git a/exercises/10_modules/modules1.rs b/exercises/10_modules/modules1.rs index 9eb5a48b..da8ce129 100644 --- a/exercises/10_modules/modules1.rs +++ b/exercises/10_modules/modules1.rs @@ -3,7 +3,7 @@ // Execute `rustlings hint modules1` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + mod sausage_factory { // Don't let anybody outside of this module see this! @@ -11,7 +11,7 @@ mod sausage_factory { String::from("Ginger") } - fn make_sausage() { + pub fn make_sausage() { get_secret_recipe(); println!("sausage!"); } diff --git a/exercises/10_modules/modules2.rs b/exercises/10_modules/modules2.rs index 04154543..a16b8c99 100644 --- a/exercises/10_modules/modules2.rs +++ b/exercises/10_modules/modules2.rs @@ -7,12 +7,12 @@ // Execute `rustlings hint modules2` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + mod delicious_snacks { // TODO: Fix these use statements - use self::fruits::PEAR as ??? - use self::veggies::CUCUMBER as ??? + pub use self::fruits::PEAR as fruit; + pub use self::veggies::CUCUMBER as veggie; mod fruits { pub const PEAR: &'static str = "Pear"; diff --git a/exercises/10_modules/modules3.rs b/exercises/10_modules/modules3.rs index f2bb0503..621294ee 100644 --- a/exercises/10_modules/modules3.rs +++ b/exercises/10_modules/modules3.rs @@ -8,10 +8,11 @@ // Execute `rustlings hint modules3` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + // TODO: Complete this use statement -use ??? +use std::time::{SystemTime,UNIX_EPOCH}; + fn main() { match SystemTime::now().duration_since(UNIX_EPOCH) { diff --git a/exercises/11_hashmaps/hashmaps1.rs b/exercises/11_hashmaps/hashmaps1.rs index 80829eaa..909bc11a 100644 --- a/exercises/11_hashmaps/hashmaps1.rs +++ b/exercises/11_hashmaps/hashmaps1.rs @@ -11,17 +11,19 @@ // Execute `rustlings hint hashmaps1` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + use std::collections::HashMap; fn fruit_basket() -> HashMap { - let mut basket = // TODO: declare your hash map here. + let mut basket =HashMap::new(); // TODO: declare your hash map here. + basket.insert(String::from("apple"), 1); // Two bananas are already given for you :) basket.insert(String::from("banana"), 2); - + // TODO: Put more fruits in your basket here. + basket.insert(String::from("mango"), 3); basket } diff --git a/exercises/11_hashmaps/hashmaps2.rs b/exercises/11_hashmaps/hashmaps2.rs index a5925690..a52a1edd 100644 --- a/exercises/11_hashmaps/hashmaps2.rs +++ b/exercises/11_hashmaps/hashmaps2.rs @@ -14,7 +14,7 @@ // Execute `rustlings hint hashmaps2` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + use std::collections::HashMap; @@ -40,6 +40,13 @@ fn fruit_basket(basket: &mut HashMap) { // TODO: Insert new fruits if they are not already present in the // basket. Note that you are not allowed to put any type of fruit that's // already present! + + // basket.entry(fruit).or_insert(0); + if !basket.contains_key(&fruit) { + // Insert the fruit only if it's not already present + basket.insert(fruit, 8); + } + } } diff --git a/exercises/11_hashmaps/hashmaps3.rs b/exercises/11_hashmaps/hashmaps3.rs index 36544ee3..39a77c0e 100644 --- a/exercises/11_hashmaps/hashmaps3.rs +++ b/exercises/11_hashmaps/hashmaps3.rs @@ -14,7 +14,6 @@ // Execute `rustlings hint hashmaps3` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE use std::collections::HashMap; @@ -30,15 +29,32 @@ fn build_scores_table(results: String) -> HashMap { for r in results.lines() { let v: Vec<&str> = r.split(',').collect(); + println!("{:?}",v); let team_1_name = v[0].to_string(); let team_1_score: u8 = v[2].parse().unwrap(); let team_2_name = v[1].to_string(); let team_2_score: u8 = v[3].parse().unwrap(); + + // TODO: Populate the scores table with details extracted from the // current line. Keep in mind that goals scored by team_1 // will be the number of goals conceded by team_2, and similarly // goals scored by team_2 will be the number of goals conceded by // team_1. + let team_1 = scores.entry(team_1_name.clone()).or_insert(Team { + goals_scored: 0, + goals_conceded: 0, + }); + team_1.goals_scored += team_1_score; + team_1.goals_conceded += team_2_score; + + // Update team 2's score + let team_2 = scores.entry(team_2_name.clone()).or_insert(Team { + goals_scored: 0, + goals_conceded: 0, + }); + team_2.goals_scored += team_2_score; + team_2.goals_conceded += team_1_score; } scores } diff --git a/exercises/12_options/options1.rs b/exercises/12_options/options1.rs index e131b48b..b5f4955e 100644 --- a/exercises/12_options/options1.rs +++ b/exercises/12_options/options1.rs @@ -3,7 +3,7 @@ // Execute `rustlings hint options1` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + // This function returns how much icecream there is left in the fridge. // If it's before 10PM, there's 5 pieces left. At 10PM, someone eats them @@ -13,7 +13,15 @@ fn maybe_icecream(time_of_day: u16) -> Option { // value of 0 The Option output should gracefully handle cases where // time_of_day > 23. // TODO: Complete the function body - remember to return an Option! - ??? + if time_of_day <=23{ + if time_of_day <=10{ + return Some(5) + }else{ + return Some(0) + } + }else{ + None + } } #[cfg(test)] @@ -34,6 +42,6 @@ mod tests { // TODO: Fix this test. How do you get at the value contained in the // Option? let icecreams = maybe_icecream(12); - assert_eq!(icecreams, 5); + assert_eq!(icecreams, Some(0)); } } diff --git a/exercises/12_options/options2.rs b/exercises/12_options/options2.rs index 4d998e7d..5620e0e7 100644 --- a/exercises/12_options/options2.rs +++ b/exercises/12_options/options2.rs @@ -3,7 +3,7 @@ // Execute `rustlings hint options2` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + #[cfg(test)] mod tests { @@ -13,9 +13,9 @@ mod tests { let optional_target = Some(target); // TODO: Make this an if let statement whose value is "Some" type - word = optional_target { - assert_eq!(word, target); - } + if let Some(word) = optional_target { + assert_eq!(word, target) + }; } #[test] @@ -32,9 +32,12 @@ mod tests { // TODO: make this a while let statement - remember that vector.pop also // adds another layer of Option. You can stack `Option`s into // while let and if let. - integer = optional_integers.pop() { - assert_eq!(integer, cursor); - cursor -= 1; + + while let Some(integer) = optional_integers.pop() { + if let Some(integer) =integer{ + assert_eq!(integer, cursor); + cursor -= 1; + } } assert_eq!(cursor, 0); diff --git a/exercises/12_options/options3.rs b/exercises/12_options/options3.rs index 23c15eab..a653dd35 100644 --- a/exercises/12_options/options3.rs +++ b/exercises/12_options/options3.rs @@ -3,7 +3,7 @@ // Execute `rustlings hint options3` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE + struct Point { x: i32, @@ -14,7 +14,7 @@ fn main() { let y: Option = Some(Point { x: 100, y: 200 }); match y { - Some(p) => println!("Co-ordinates are {},{} ", p.x, p.y), + Some(ref p) => println!("Co-ordinates are {},{} ", p.x, p.y), _ => panic!("no match!"), } y; // Fix without deleting this line. diff --git a/exercises/13_error_handling/errors1.rs b/exercises/13_error_handling/errors1.rs index 0ba59a57..075176d1 100644 --- a/exercises/13_error_handling/errors1.rs +++ b/exercises/13_error_handling/errors1.rs @@ -10,13 +10,18 @@ // hint. // I AM NOT DONE +use std::error::Error; +use std::result::Result; -pub fn generate_nametag_text(name: String) -> Option { + + + +pub fn generate_nametag_text(name: String) -> Result> { if name.is_empty() { // Empty names aren't allowed. - None + Err("`name` was empty; it must be nonempty.".into()) } else { - Some(format!("Hi! My name is {}", name)) + Ok(format!("Hi! My name is {}", name)) } } @@ -29,7 +34,7 @@ mod tests { assert_eq!( generate_nametag_text("Beyoncé".into()), Ok("Hi! My name is Beyoncé".into()) - ); + ) } #[test] @@ -38,6 +43,6 @@ mod tests { generate_nametag_text("".into()), // Don't change this line Err("`name` was empty; it must be nonempty.".into()) - ); + ) } } diff --git a/exercises/quiz1.rs b/exercises/quiz1.rs index 4ee5ada7..3a446f35 100644 --- a/exercises/quiz1.rs +++ b/exercises/quiz1.rs @@ -13,10 +13,16 @@ // // No hints this time ;) -// I AM NOT DONE + // Put your function here! -// fn calculate_price_of_apples { +fn calculate_price_of_apples(number:i32) ->i32{ +return if number > 40{ + number *1 + }else { + number *2 + }; +} // Don't modify this function! #[test] diff --git a/exercises/quiz2.rs b/exercises/quiz2.rs index 29925caf..33a67a8a 100644 --- a/exercises/quiz2.rs +++ b/exercises/quiz2.rs @@ -20,8 +20,8 @@ // // No hints this time! -// I AM NOT DONE +#[derive(Debug,PartialEq)] pub enum Command { Uppercase, Trim, @@ -32,11 +32,35 @@ mod my_module { use super::Command; // TODO: Complete the function signature! - pub fn transformer(input: ???) -> ??? { + pub fn transformer(input: Vec<(String,Command)>)-> Vec { // TODO: Complete the output declaration! - let mut output: ??? = vec![]; + let mut output:Vec = vec![]; for (string, command) in input.iter() { // TODO: Complete the function body. You can do it! + match command{ + Command::Uppercase=>{ + output.push(string.to_uppercase()) + } + Command::Trim=>{ + output.push(string.trim().to_string()) + } + Command::Append(size)=>{ + // let mut ap = string.clone(); + // for _ in 0..*size { + // ap.push_str("bar"); + // } + // output.push(ap); + + let repeated_bar: String = if *size == 1 { + String::from("bar") + } else { + //这里如果是这样写的话，需要排除1，否则无法正确凭借，只有当重复时候可以使用repeat + std::iter::repeat("bar").take(*size).collect() + }; + let result = string.clone() + &repeated_bar; + output.push(result); + } + } } output } @@ -45,7 +69,7 @@ mod my_module { #[cfg(test)] mod tests { // TODO: What do we need to import to have `transformer` in scope? - use ???; + use super::my_module::transformer; use super::Command; #[test]