From 44efc4e82174de1582069b5c61b27c9aee9cf130 Mon Sep 17 00:00:00 2001 From: Max B Date: Thu, 17 Nov 2022 13:02:00 +0100 Subject: [PATCH 1/3] Successfully fixed all bugs in the Variables section --- exercises/variables/variables1.rs | 4 ++-- exercises/variables/variables2.rs | 4 ++-- exercises/variables/variables3.rs | 4 ++-- exercises/variables/variables4.rs | 4 ++-- exercises/variables/variables5.rs | 4 ++-- exercises/variables/variables6.rs | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/exercises/variables/variables1.rs b/exercises/variables/variables1.rs index f4d182ac..14758e98 100644 --- a/exercises/variables/variables1.rs +++ b/exercises/variables/variables1.rs @@ -2,9 +2,9 @@ // Make me compile! // 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 641aeb8e..c1c5d260 100644 --- a/exercises/variables/variables2.rs +++ b/exercises/variables/variables2.rs @@ -1,10 +1,10 @@ // variables2.rs // Execute `rustlings hint variables2` or use the `hint` watch subcommand for a hint. -// I AM NOT DONE + fn main() { - let x; + let x = 19; if x == 10 { println!("x is ten!"); } else { diff --git a/exercises/variables/variables3.rs b/exercises/variables/variables3.rs index 819b1bc7..338c3b23 100644 --- a/exercises/variables/variables3.rs +++ b/exercises/variables/variables3.rs @@ -1,9 +1,9 @@ // variables3.rs // 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 = -25; println!("Number {}", x); } diff --git a/exercises/variables/variables4.rs b/exercises/variables/variables4.rs index 54491b0a..f64b56a2 100644 --- a/exercises/variables/variables4.rs +++ b/exercises/variables/variables4.rs @@ -1,10 +1,10 @@ // variables4.rs // 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 0e670d2a..ed9cb646 100644 --- a/exercises/variables/variables5.rs +++ b/exercises/variables/variables5.rs @@ -1,11 +1,11 @@ // variables5.rs // 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 mut 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 a8520122..e4dfa10e 100644 --- a/exercises/variables/variables6.rs +++ b/exercises/variables/variables6.rs @@ -1,9 +1,9 @@ // variables6.rs // Execute `rustlings hint variables6` or use the `hint` watch subcommand for a hint. -// I AM NOT DONE -const NUMBER = 3; + +const NUMBER: u8 = 3; fn main() { println!("Number {}", NUMBER); } From 1421614d2b12623b83f8786c30b740a5ae20ad33 Mon Sep 17 00:00:00 2001 From: Max B Date: Thu, 17 Nov 2022 16:49:35 +0100 Subject: [PATCH 2/3] Completed all exercises for the functions in rust --- exercises/functions/functions1.rs | 5 ++++- exercises/functions/functions2.rs | 4 ++-- exercises/functions/functions3.rs | 4 ++-- exercises/functions/functions4.rs | 4 ++-- exercises/functions/functions5.rs | 4 ++-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/exercises/functions/functions1.rs b/exercises/functions/functions1.rs index 03d8af70..b10bcbce 100644 --- a/exercises/functions/functions1.rs +++ b/exercises/functions/functions1.rs @@ -1,8 +1,11 @@ // functions1.rs // Execute `rustlings hint functions1` or use the `hint` watch subcommand for a hint. -// I AM NOT DONE + fn main() { call_me(); } +fn call_me () { + +} \ No newline at end of file diff --git a/exercises/functions/functions2.rs b/exercises/functions/functions2.rs index 7d40a578..02c6c492 100644 --- a/exercises/functions/functions2.rs +++ b/exercises/functions/functions2.rs @@ -1,13 +1,13 @@ // functions2.rs // 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: u8) { for i in 0..num { println!("Ring! Call number {}", i + 1); } diff --git a/exercises/functions/functions3.rs b/exercises/functions/functions3.rs index 3b9e585b..ce66a5fa 100644 --- a/exercises/functions/functions3.rs +++ b/exercises/functions/functions3.rs @@ -1,10 +1,10 @@ // functions3.rs // Execute `rustlings hint functions3` or use the `hint` watch subcommand for a hint. -// I AM NOT DONE + fn main() { - call_me(); + call_me(8); } fn call_me(num: u32) { diff --git a/exercises/functions/functions4.rs b/exercises/functions/functions4.rs index 65d5be4f..9e46c48e 100644 --- a/exercises/functions/functions4.rs +++ b/exercises/functions/functions4.rs @@ -7,14 +7,14 @@ // in the signatures for now. If anything, this is a good way to peek ahead // to future exercises!) -// 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 5d762961..3da51720 100644 --- a/exercises/functions/functions5.rs +++ b/exercises/functions/functions5.rs @@ -1,7 +1,7 @@ // functions5.rs // Execute `rustlings hint functions5` or use the `hint` watch subcommand for a hint. -// I AM NOT DONE + fn main() { let answer = square(3); @@ -9,5 +9,5 @@ fn main() { } fn square(num: i32) -> i32 { - num * num; + num * num } From 01da8af9c4bdac0b2b2d4233024b220de60fffc1 Mon Sep 17 00:00:00 2001 From: Max B Date: Thu, 17 Nov 2022 17:10:38 +0100 Subject: [PATCH 3/3] Completed all functions exercises --- exercises/functions/functions1.rs | 4 ++-- exercises/functions/functions2.rs | 2 +- exercises/functions/functions3.rs | 2 +- exercises/functions/functions4.rs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/exercises/functions/functions1.rs b/exercises/functions/functions1.rs index b10bcbce..6bc09d29 100644 --- a/exercises/functions/functions1.rs +++ b/exercises/functions/functions1.rs @@ -4,8 +4,8 @@ fn main() { - call_me(); + call(); } -fn call_me () { +fn call () { } \ No newline at end of file diff --git a/exercises/functions/functions2.rs b/exercises/functions/functions2.rs index 02c6c492..b1206b04 100644 --- a/exercises/functions/functions2.rs +++ b/exercises/functions/functions2.rs @@ -7,7 +7,7 @@ fn main() { call_me(3); } -fn call_me(num: u8) { +fn call_me(num:u8) { for i in 0..num { println!("Ring! Call number {}", i + 1); } diff --git a/exercises/functions/functions3.rs b/exercises/functions/functions3.rs index ce66a5fa..181aa383 100644 --- a/exercises/functions/functions3.rs +++ b/exercises/functions/functions3.rs @@ -4,7 +4,7 @@ fn main() { - call_me(8); + call_me(9); } fn call_me(num: u32) { diff --git a/exercises/functions/functions4.rs b/exercises/functions/functions4.rs index 9e46c48e..788b4fff 100644 --- a/exercises/functions/functions4.rs +++ b/exercises/functions/functions4.rs @@ -14,7 +14,7 @@ fn main() { println!("Your sale price is {}", sale_price(original_price)); } -fn sale_price(price: i32) -> i32 { +fn sale_price(price: i8) -> i8 { if is_even(price) { price - 10 } else { @@ -22,6 +22,6 @@ fn sale_price(price: i32) -> i32 { } } -fn is_even(num: i32) -> bool { +fn is_even(num: i8) -> bool { num % 2 == 0 }