From ef6e023d4c87b3f46fd978cb9f2eb8b81af0b15c Mon Sep 17 00:00:00 2001
From: Greg Gradwell <greghgradwell@live.com>
Date: Wed, 18 Nov 2020 23:09:42 -0800
Subject: [PATCH] completed variables, functions, primitives, ifs.
---
exercises/functions/functions1.rs | 6 ++++--
exercises/functions/functions2.rs | 4 +---
exercises/functions/functions3.rs | 4 +---
exercises/functions/functions4.rs | 4 +---
exercises/functions/functions5.rs | 4 +---
exercises/if/if1.rs | 4 ++--
exercises/if/if2.rs | 6 +++---
exercises/primitive_types/primitive_types1.rs | 4 +---
exercises/primitive_types/primitive_types2.rs | 4 +---
exercises/primitive_types/primitive_types3.rs | 5 ++---
exercises/quiz1.rs | 10 ++++++++--
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 +---
17 files changed, 31 insertions(+), 48 deletions(-)
diff --git a/exercises/functions/functions1.rs b/exercises/functions/functions1.rs
index 3112527..d9cd21a 100644
--- a/exercises/functions/functions1.rs
+++ b/exercises/functions/functions1.rs
@@ -1,8 +1,10 @@
// functions1.rs
// Make me compile! Execute `rustlings hint functions1` for hints :)
-// I AM NOT DONE
-
fn main() {
call_me();
}
+
+fn call_me() {
+ println!("maybe");
+}
diff --git a/exercises/functions/functions2.rs b/exercises/functions/functions2.rs
index 108ba38..85eb4db 100644
--- a/exercises/functions/functions2.rs
+++ b/exercises/functions/functions2.rs
@@ -1,13 +1,11 @@
// functions2.rs
// Make me compile! Execute `rustlings hint functions2` for hints :)
-// 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 e3c1bf7..a818d1f 100644
--- a/exercises/functions/functions3.rs
+++ b/exercises/functions/functions3.rs
@@ -1,10 +1,8 @@
// functions3.rs
// Make me compile! Execute `rustlings hint functions3` for hints :)
-// I AM NOT DONE
-
fn main() {
- call_me();
+ call_me(5);
}
fn call_me(num: i32) {
diff --git a/exercises/functions/functions4.rs b/exercises/functions/functions4.rs
index 58637e4..7d39271 100644
--- a/exercises/functions/functions4.rs
+++ b/exercises/functions/functions4.rs
@@ -4,14 +4,12 @@
// This store is having a sale where if the price is an even number, you get
// 10 Rustbucks off, but if it's an odd number, it's 3 Rustbucks off.
-// 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 d22aa6c..059e929 100644
--- a/exercises/functions/functions5.rs
+++ b/exercises/functions/functions5.rs
@@ -1,13 +1,11 @@
// functions5.rs
// Make me compile! Execute `rustlings hint functions5` for hints :)
-// I AM NOT DONE
-
fn main() {
let answer = square(3);
println!("The answer is {}", answer);
}
fn square(num: i32) -> i32 {
- num * num;
+ num * num
}
diff --git a/exercises/if/if1.rs b/exercises/if/if1.rs
index 9086754..8f7b855 100644
--- a/exercises/if/if1.rs
+++ b/exercises/if/if1.rs
@@ -1,13 +1,13 @@
// if1.rs
-// 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
// Execute `rustlings hint if1` for hints
+ 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 80effbd..545083a 100644
--- a/exercises/if/if2.rs
+++ b/exercises/if/if2.rs
@@ -4,13 +4,13 @@
// Step 2: Get the bar_for_fuzz and default_to_baz tests passing!
// Execute the command `rustlings hint if2` if you want a hint :)
-// I AM NOT DONE
-
pub fn fizz_if_foo(fizzish: &str) -> &str {
if fizzish == "fizz" {
"foo"
+ } else if fizzish == "fuzz" {
+ "bar"
} else {
- 1
+ "baz"
}
}
diff --git a/exercises/primitive_types/primitive_types1.rs b/exercises/primitive_types/primitive_types1.rs
index 0912139..715ca72 100644
--- a/exercises/primitive_types/primitive_types1.rs
+++ b/exercises/primitive_types/primitive_types1.rs
@@ -2,8 +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 +10,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/primitive_types/primitive_types2.rs b/exercises/primitive_types/primitive_types2.rs
index 6576a4d..b77a0d1 100644
--- a/exercises/primitive_types/primitive_types2.rs
+++ b/exercises/primitive_types/primitive_types2.rs
@@ -2,8 +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 +14,7 @@ fn main() {
println!("Neither alphabetic nor numeric!");
}
- let // Finish this line like the example! What's your favorite character?
+ let your_character = '8';// 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..6cde2cf 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 = 1..101;
+ let a = [0;100];
if a.len() >= 100 {
println!("Wow, that's a big array!");
diff --git a/exercises/quiz1.rs b/exercises/quiz1.rs
index 5c5c355..1145f39 100644
--- a/exercises/quiz1.rs
+++ b/exercises/quiz1.rs
@@ -7,8 +7,6 @@
// 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 ..... {
@@ -21,3 +19,11 @@ fn verify_test() {
assert_eq!(70, price1);
assert_eq!(65, price2);
}
+
+fn calculate_apple_price(x:i32) -> i32 {
+ if (x > 40) {
+ x*1
+ } else {
+ x*2
+ }
+}
diff --git a/exercises/variables/variables1.rs b/exercises/variables/variables1.rs
index 4a3af73..db85e7e 100644
--- a/exercises/variables/variables1.rs
+++ b/exercises/variables/variables1.rs
@@ -6,9 +6,7 @@
// even after you already figured it out. If you got everything working and
// feel ready for the next exercise, remove the `I AM NOT DONE` comment below.
-// 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 7774a8f..7915ab7 100644
--- a/exercises/variables/variables2.rs
+++ b/exercises/variables/variables2.rs
@@ -1,10 +1,8 @@
// variables2.rs
// Make me compile! Execute the command `rustlings hint variables2` if you want a hint :)
-// I AM NOT DONE
-
fn main() {
- let x;
+ let x = 9;
if x == 10 {
println!("Ten!");
} else {
diff --git a/exercises/variables/variables3.rs b/exercises/variables/variables3.rs
index 30ec48f..7d84709 100644
--- a/exercises/variables/variables3.rs
+++ b/exercises/variables/variables3.rs
@@ -1,10 +1,8 @@
// variables3.rs
// Make me compile! Execute the command `rustlings hint variables3` if you want 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/variables4.rs b/exercises/variables/variables4.rs
index 77f1e9a..cab02d7 100644
--- a/exercises/variables/variables4.rs
+++ b/exercises/variables/variables4.rs
@@ -1,9 +1,7 @@
// variables4.rs
// Make me compile! Execute the command `rustlings hint variables4` if you want a hint :)
-// I AM NOT DONE
-
fn main() {
- let x: i32;
+ let x: i32 = 398723;
println!("Number {}", x);
}
diff --git a/exercises/variables/variables5.rs b/exercises/variables/variables5.rs
index da37ae9..10ef314 100644
--- a/exercises/variables/variables5.rs
+++ b/exercises/variables/variables5.rs
@@ -1,11 +1,9 @@
// variables5.rs
// Make me compile! Execute the command `rustlings hint variables5` if you want a hint :)
-// I AM NOT DONE
-
fn main() {
let number = "T-H-R-E-E";
println!("Spell a Number : {}", number);
- number = 3;
+ let number = 3;
println!("Number plus two is : {}", number + 2);
}
diff --git a/exercises/variables/variables6.rs b/exercises/variables/variables6.rs
index 9866691..12da6f1 100644
--- a/exercises/variables/variables6.rs
+++ b/exercises/variables/variables6.rs
@@ -1,9 +1,7 @@
// variables6.rs
// Make me compile! Execute the command `rustlings hint variables6` if you want a hint :)
-// I AM NOT DONE
-
-const NUMBER = 3;
+const NUMBER:i8 = 3;
fn main() {
println!("Number {}", NUMBER);
}