From c6dab0c27933e6f83901e86afb780bea4d80049a Mon Sep 17 00:00:00 2001 From: WiBere <91265465+WiBere@users.noreply.github.com> Date: Fri, 21 Jul 2023 17:46:31 +0000 Subject: [PATCH] Pending changes exported from your codespace --- exercises/functions/functions1.rs | 4 +++- exercises/functions/functions2.rs | 3 +-- exercises/functions/functions3.rs | 3 +-- exercises/functions/functions4.rs | 3 +-- exercises/functions/functions5.rs | 3 +-- exercises/if/if1.rs | 11 ++++++----- exercises/if/if2.rs | 10 ++++++---- exercises/if/if3.rs | 6 +++--- exercises/intro/intro1.rs | 1 - exercises/intro/intro2.rs | 4 ++-- exercises/quiz1.rs | 11 ++++++++--- exercises/variables/variables1.rs | 4 +--- exercises/variables/variables2.rs | 3 +-- exercises/variables/variables3.rs | 3 +-- exercises/variables/variables4.rs | 3 +-- exercises/variables/variables5.rs | 4 ++-- exercises/variables/variables6.rs | 4 ++-- rustlings | 1 + 18 files changed, 41 insertions(+), 40 deletions(-) create mode 160000 rustlings diff --git a/exercises/functions/functions1.rs b/exercises/functions/functions1.rs index 40ed9a07..c4f57611 100644 --- a/exercises/functions/functions1.rs +++ b/exercises/functions/functions1.rs @@ -3,7 +3,9 @@ // Execute `rustlings hint functions1` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE +fn call_me(){ + +} fn main() { call_me(); diff --git a/exercises/functions/functions2.rs b/exercises/functions/functions2.rs index 5154f34d..70610cd7 100644 --- a/exercises/functions/functions2.rs +++ b/exercises/functions/functions2.rs @@ -3,13 +3,12 @@ // 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/functions/functions3.rs b/exercises/functions/functions3.rs index 74f44d6d..0a01731c 100644 --- a/exercises/functions/functions3.rs +++ b/exercises/functions/functions3.rs @@ -3,10 +3,9 @@ // Execute `rustlings hint functions3` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE fn main() { - call_me(); + call_me(3); } fn call_me(num: u32) { diff --git a/exercises/functions/functions4.rs b/exercises/functions/functions4.rs index 77c4b2aa..3b41a75f 100644 --- a/exercises/functions/functions4.rs +++ b/exercises/functions/functions4.rs @@ -8,14 +8,13 @@ // 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/functions/functions5.rs b/exercises/functions/functions5.rs index f1b63f48..a9dd1b57 100644 --- a/exercises/functions/functions5.rs +++ b/exercises/functions/functions5.rs @@ -3,7 +3,6 @@ // 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 +10,5 @@ fn main() { } fn square(num: i32) -> i32 { - num * num; + num * num } diff --git a/exercises/if/if1.rs b/exercises/if/if1.rs index d8108a0f..e9d92281 100644 --- a/exercises/if/if1.rs +++ b/exercises/if/if1.rs @@ -2,13 +2,14 @@ // // 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{ + a + } + else{ + b + } } // Don't mind this for now :) diff --git a/exercises/if/if2.rs b/exercises/if/if2.rs index f512f13f..31f3e999 100644 --- a/exercises/if/if2.rs +++ b/exercises/if/if2.rs @@ -5,13 +5,15 @@ // // 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/if/if3.rs b/exercises/if/if3.rs index 73a7025b..b1c9489c 100644 --- a/exercises/if/if3.rs +++ b/exercises/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" + -1 }; // DO NOT CHANGE THIS STATEMENT BELOW diff --git a/exercises/intro/intro1.rs b/exercises/intro/intro1.rs index 37fa0112..6bb098ae 100644 --- a/exercises/intro/intro1.rs +++ b/exercises/intro/intro1.rs @@ -13,7 +13,6 @@ // 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/intro/intro2.rs b/exercises/intro/intro2.rs index 990b20f0..187d0152 100644 --- a/exercises/intro/intro2.rs +++ b/exercises/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() { - println!("Hello {}!"); + println!("Hello world!"); } diff --git a/exercises/quiz1.rs b/exercises/quiz1.rs index a9904b8b..5e9d8766 100644 --- a/exercises/quiz1.rs +++ b/exercises/quiz1.rs @@ -13,11 +13,16 @@ // // No hints this time ;) -// I AM NOT DONE // Put your function here! -// fn calculate_price_of_apples { - +fn calculate_price_of_apples(num_apples: u32) -> u32{ + if num_apples <=40{ + num_apples*2 + } + else{ + num_apples + } +} // Don't modify this function! #[test] fn verify_test() { diff --git a/exercises/variables/variables1.rs b/exercises/variables/variables1.rs index b3e089a5..98a0cf22 100644 --- a/exercises/variables/variables1.rs +++ b/exercises/variables/variables1.rs @@ -5,9 +5,7 @@ // 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/variables/variables2.rs b/exercises/variables/variables2.rs index e1c23edf..ff9a7810 100644 --- a/exercises/variables/variables2.rs +++ b/exercises/variables/variables2.rs @@ -3,10 +3,9 @@ // 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/variables/variables3.rs b/exercises/variables/variables3.rs index 86bed419..5db22418 100644 --- a/exercises/variables/variables3.rs +++ b/exercises/variables/variables3.rs @@ -3,9 +3,8 @@ // 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 = 100; println!("Number {}", x); } diff --git a/exercises/variables/variables4.rs b/exercises/variables/variables4.rs index 5394f394..2d056da9 100644 --- a/exercises/variables/variables4.rs +++ b/exercises/variables/variables4.rs @@ -3,10 +3,9 @@ // Execute `rustlings hint variables4` or use the `hint` watch subcommand for a // hint. -// I AM NOT DONE fn main() { - let x = 3; + let mut x = 3; println!("Number {}", x); x = 5; // don't change this line println!("Number {}", x); diff --git a/exercises/variables/variables5.rs b/exercises/variables/variables5.rs index a29b38be..e1931b72 100644 --- a/exercises/variables/variables5.rs +++ b/exercises/variables/variables5.rs @@ -3,11 +3,11 @@ // 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/variables/variables6.rs b/exercises/variables/variables6.rs index 853183ba..9eee2036 100644 --- a/exercises/variables/variables6.rs +++ b/exercises/variables/variables6.rs @@ -3,9 +3,9 @@ // 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/rustlings b/rustlings new file mode 160000 index 00000000..f2de12aa --- /dev/null +++ b/rustlings @@ -0,0 +1 @@ +Subproject commit f2de12aa3443af2e989a045d9035294184d36eee