diff --git a/.gitpod.yml b/.gitpod.yml
index 40f8cfc..1008112 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -3,3 +3,7 @@ tasks:
command: cargo watch -x run
image:
file: .gitpod.Dockerfile
+
+vscode:
+ extensions:
+ - eamodio.gitlens@10.2.0:GNDO73Cmp0fYDiLNxVkbsQ==
\ No newline at end of file
diff --git a/exercises/enums/enums1.rs b/exercises/enums/enums1.rs
index a2223d3..72ff555 100644
--- a/exercises/enums/enums1.rs
+++ b/exercises/enums/enums1.rs
@@ -1,11 +1,11 @@
// enums1.rs
// Make me compile! Execute `rustlings hint enums1` for hints!
-// 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/enums/enums2.rs b/exercises/enums/enums2.rs
index 52ccb22..71c1a52 100644
--- a/exercises/enums/enums2.rs
+++ b/exercises/enums/enums2.rs
@@ -1,11 +1,14 @@
// enums2.rs
// Make me compile! Execute `rustlings hint enums2` for hints!
-// I AM NOT DONE
#[derive(Debug)]
enum Message {
// TODO: define the different variants used below
+ Move{x:i32,y:i32},
+ Quit,
+ ChangeColor(i32,i32,i32),
+ Echo(String),
}
impl Message {
diff --git a/exercises/enums/enums3.rs b/exercises/enums/enums3.rs
index bb7dfb4..b3a2a9f 100644
--- a/exercises/enums/enums3.rs
+++ b/exercises/enums/enums3.rs
@@ -1,10 +1,13 @@
// enums3.rs
// Address all the TODOs to make the tests pass!
-// I AM NOT DONE
enum Message {
// TODO: implement the message variant types based on their usage below
+ ChangeColor(u8,u8,u8),
+ Echo(String),
+ Move{x:u8,y:u8},
+ Quit,
}
struct Point {
@@ -36,6 +39,12 @@ impl State {
}
fn process(&mut self, message: Message) {
+ match message {
+ Message::ChangeColor(r,g,b)=>self.change_color((r,g,b)),
+ Message::Echo(s)=>self.echo(s),
+ Message::Move{x,y}=>self.move_position(Point{x,y}),
+ Message::Quit=>self.quit()
+ }
// TODO: create a match expression to process the different message variants
}
}
diff --git a/exercises/functions/functions1.rs b/exercises/functions/functions1.rs
index 3112527..cce9a6f 100644
--- a/exercises/functions/functions1.rs
+++ b/exercises/functions/functions1.rs
@@ -1,7 +1,7 @@
// functions1.rs
// Make me compile! Execute `rustlings hint functions1` for hints :)
-// I AM NOT DONE
+fn call_me(){}
fn main() {
call_me();
diff --git a/exercises/functions/functions2.rs b/exercises/functions/functions2.rs
index 108ba38..331cfa9 100644
--- a/exercises/functions/functions2.rs
+++ b/exercises/functions/functions2.rs
@@ -1,13 +1,12 @@
// 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:i8) {
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..b3bff7d 100644
--- a/exercises/functions/functions3.rs
+++ b/exercises/functions/functions3.rs
@@ -1,10 +1,9 @@
// functions3.rs
// Make me compile! Execute `rustlings hint functions3` for hints :)
-// I AM NOT DONE
fn main() {
- call_me();
+ call_me(32);
}
fn call_me(num: i32) {
diff --git a/exercises/functions/functions4.rs b/exercises/functions/functions4.rs
index 6bf46f0..eab4b6f 100644
--- a/exercises/functions/functions4.rs
+++ b/exercises/functions/functions4.rs
@@ -4,14 +4,13 @@
// This store is having a sale where if the price is an even number, you get
// 10 (money unit) off, but if it's an odd number, it's 3 (money unit) less.
-// 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..6b683b8 100644
--- a/exercises/functions/functions5.rs
+++ b/exercises/functions/functions5.rs
@@ -1,7 +1,7 @@
// functions5.rs
// Make me compile! Execute `rustlings hint functions5` for hints :)
-// I AM NOT DONE
+
fn main() {
let answer = square(3);
@@ -9,5 +9,5 @@ fn main() {
}
fn square(num: i32) -> i32 {
- num * num;
+ return num * num;
}
diff --git a/exercises/if/if1.rs b/exercises/if/if1.rs
index 9086754..cc3536a 100644
--- a/exercises/if/if1.rs
+++ b/exercises/if/if1.rs
@@ -1,8 +1,11 @@
// if1.rs
-// I AM NOT DONE
pub fn bigger(a: i32, b: i32) -> i32 {
+ if a>b {
+ return a
+ }
+ return b
// Complete this function to return the bigger number!
// Do not use:
// - another function call
diff --git a/exercises/macros/macros1.rs b/exercises/macros/macros1.rs
index ed0dac8..fee36ad 100644
--- a/exercises/macros/macros1.rs
+++ b/exercises/macros/macros1.rs
@@ -1,8 +1,7 @@
// macros1.rs
// Make me compile! Execute `rustlings hint macros1` for hints :)
-// I AM NOT DONE
-
+#[macro_export]
macro_rules! my_macro {
() => {
println!("Check out my macro!");
@@ -10,5 +9,5 @@ macro_rules! my_macro {
}
fn main() {
- my_macro();
+ my_macro!();
}
diff --git a/exercises/macros/macros2.rs b/exercises/macros/macros2.rs
index d0be123..a7ea656 100644
--- a/exercises/macros/macros2.rs
+++ b/exercises/macros/macros2.rs
@@ -1,12 +1,11 @@
// macros2.rs
// Make me compile! Execute `rustlings hint macros2` for hints :)
-// I AM NOT DONE
fn main() {
my_macro!();
}
-
+#[macro_export]
macro_rules! my_macro {
() => {
println!("Check out my macro!");
diff --git a/exercises/macros/macros3.rs b/exercises/macros/macros3.rs
index 93a4311..cc27969 100644
--- a/exercises/macros/macros3.rs
+++ b/exercises/macros/macros3.rs
@@ -2,8 +2,8 @@
// Make me compile, without taking the macro out of the module!
// Execute `rustlings hint macros3` for hints :)
-// I AM NOT DONE
+#[macro_use]
mod macros {
macro_rules! my_macro {
() => {
@@ -13,5 +13,6 @@ mod macros {
}
fn main() {
+
my_macro!();
}
diff --git a/exercises/macros/macros4.rs b/exercises/macros/macros4.rs
index 3a74807..613fef6 100644
--- a/exercises/macros/macros4.rs
+++ b/exercises/macros/macros4.rs
@@ -1,12 +1,12 @@
// macros4.rs
// Make me compile! Execute `rustlings hint macros4` for hints :)
-// I AM NOT DONE
+
macro_rules! my_macro {
() => {
println!("Check out my macro!");
- }
+ };
($val:expr) => {
println!("Look at this other macro: {}", $val);
}
diff --git a/exercises/modules/modules1.rs b/exercises/modules/modules1.rs
index 812dfee..87d1f6e 100644
--- a/exercises/modules/modules1.rs
+++ b/exercises/modules/modules1.rs
@@ -1,10 +1,10 @@
// modules1.rs
// Make me compile! Execute `rustlings hint modules1` for hints :)
-// I AM NOT DONE
+
mod sausage_factory {
- fn make_sausage() {
+ pub fn make_sausage() {
println!("sausage!");
}
}
diff --git a/exercises/modules/modules2.rs b/exercises/modules/modules2.rs
index fde439d..c745c9c 100644
--- a/exercises/modules/modules2.rs
+++ b/exercises/modules/modules2.rs
@@ -1,11 +1,11 @@
// modules2.rs
// Make me compile! Execute `rustlings hint modules2` for hints :)
-// I AM NOT DONE
+
mod delicious_snacks {
- use self::fruits::PEAR as fruit;
- use self::veggies::CUCUMBER as veggie;
+ 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/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/primitive_types/primitive_types1.rs b/exercises/primitive_types/primitive_types1.rs
index 0912139..c90b05e 100644
--- a/exercises/primitive_types/primitive_types1.rs
+++ b/exercises/primitive_types/primitive_types1.rs
@@ -2,7 +2,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`)
@@ -12,7 +12,8 @@ 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..734ea06 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,8 @@ fn main() {
println!("Neither alphabetic nor numeric!");
}
- let // Finish this line like the example! What's your favorite character?
+ let your_character='z';
+ // 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 dfd6351..bc823e3 100644
--- a/exercises/primitive_types/primitive_types3.rs
+++ b/exercises/primitive_types/primitive_types3.rs
@@ -2,11 +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:[i32;1] = [1];
if a.len() >= 100 {
println!("Wow, that's a big array!");
} else {
diff --git a/exercises/primitive_types/primitive_types4.rs b/exercises/primitive_types/primitive_types4.rs
index 10b553e..be71e3f 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..fdb60b4 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 2bc817e..8e63f8e 100644
--- a/exercises/primitive_types/primitive_types6.rs
+++ b/exercises/primitive_types/primitive_types6.rs
@@ -3,9 +3,8 @@
// You can put this right into the `println!` where the ??? is.
// Execute `rustlings hint primitive_types6` for hints!
-// I AM NOT DONE
fn main() {
let numbers = (1, 2, 3);
- println!("The second number is {}", ???);
+ println!("The second number is {}", numbers.1);
}
diff --git a/exercises/strings/strings1.rs b/exercises/strings/strings1.rs
index 8090244..46cee98 100644
--- a/exercises/strings/strings1.rs
+++ b/exercises/strings/strings1.rs
@@ -2,7 +2,6 @@
// Make me compile without changing the function signature!
// Execute `rustlings hint strings1` for hints ;)
-// I AM NOT DONE
fn main() {
let answer = current_favorite_color();
@@ -10,5 +9,5 @@ fn main() {
}
fn current_favorite_color() -> String {
- "blue"
+ String::from("blue")
}
diff --git a/exercises/strings/strings2.rs b/exercises/strings/strings2.rs
index 5a2ce74..9f5e539 100644
--- a/exercises/strings/strings2.rs
+++ b/exercises/strings/strings2.rs
@@ -2,10 +2,9 @@
// Make me compile without changing the function signature!
// Execute `rustlings hint strings2` for hints :)
-// I AM NOT DONE
fn main() {
- let word = String::from("green"); // Try not changing this line :)
+ let word = "ss"; // Try not changing this line :)
if is_a_color_word(word) {
println!("That is a color word I know!");
} else {
diff --git a/exercises/structs/structs1.rs b/exercises/structs/structs1.rs
index 6d0b2f4..86cb9f6 100644
--- a/exercises/structs/structs1.rs
+++ b/exercises/structs/structs1.rs
@@ -1,17 +1,17 @@
// 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;
-
#[cfg(test)]
mod tests {
use super::*;
@@ -19,7 +19,7 @@ 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 +28,7 @@ mod tests {
#[test]
fn tuple_structs() {
// TODO: Instantiate a tuple struct!
- // let green =
+ let green =(String::from("green"),String::from("#00FF00"));
assert_eq!(green.0, "green");
assert_eq!(green.1, "#00FF00");
@@ -37,7 +37,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 0699137..b14496a 100644
--- a/exercises/structs/structs2.rs
+++ b/exercises/structs/structs2.rs
@@ -2,7 +2,6 @@
// Address all the TODOs to make the tests pass!
// No hints, just do it!
-// I AM NOT DONE
#[derive(Debug)]
struct Order {
@@ -35,7 +34,7 @@ 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/test1.rs b/exercises/test1.rs
index 3e13ce5..06f43c8 100644
--- a/exercises/test1.rs
+++ b/exercises/test1.rs
@@ -7,10 +7,16 @@
// 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 ..... {
+fn calculate_apple_price(num: i32) -> i32 {
+ if num > 40 {
+ return num;
+ }
+ return num * 2;
+}
// Don't modify this function!
#[test]
diff --git a/exercises/test2.rs b/exercises/test2.rs
index d01606c..153c618 100644
--- a/exercises/test2.rs
+++ b/exercises/test2.rs
@@ -7,7 +7,7 @@
// you think each value is. That is, add either `string_slice` or `string`
// before the parentheses on each line. If you're right, it will compile!
-// I AM NOT DONE
+
fn string_slice(arg: &str) {
println!("{}", arg);
@@ -21,7 +21,7 @@ fn main() {
("red".to_string());
(String::from("hi"));
("rust is fun!".to_owned());
- ("nice weather".into());
+ (String::from("nice weather").into_boxed_str());
(format!("Interpolation {}", "Station"));
(&String::from("abc")[0..1]);
(" hello there ".trim());
diff --git a/exercises/test3.rs b/exercises/test3.rs
index f94c36f..e2c55a0 100644
--- a/exercises/test3.rs
+++ b/exercises/test3.rs
@@ -7,7 +7,6 @@
// we expect to get when we call `times_two` with a negative number.
// No hints, you can do this :)
-// I AM NOT DONE
pub fn times_two(num: i32) -> i32 {
num * 2
@@ -19,11 +18,12 @@ mod tests {
#[test]
fn returns_twice_of_positive_numbers() {
- assert_eq!(times_two(4), ???);
+ assert_eq!(times_two(4), 8)
}
#[test]
fn returns_twice_of_negative_numbers() {
// TODO write an assert for `times_two(-4)`
+ assert_eq!(times_two(-4),-8)
}
}
diff --git a/exercises/test4.rs b/exercises/test4.rs
index c543a64..b4b5b4c 100644
--- a/exercises/test4.rs
+++ b/exercises/test4.rs
@@ -4,8 +4,12 @@
// - Macros
// Write a macro that passes the test! No hints this time, you can do it!
+#[macro_export]
+macro_rules! my_macro {
+ ($val:expr) => {$val}
+}
+
-// I AM NOT DONE
fn main() {
if my_macro!("world!") != "Hello world!" {
diff --git a/exercises/tests/tests1.rs b/exercises/tests/tests1.rs
index f3e36f2..bb0ad8d 100644
--- a/exercises/tests/tests1.rs
+++ b/exercises/tests/tests1.rs
@@ -6,12 +6,11 @@
// This test has a problem with it -- make the test compile! Make the test
// pass! Make the test fail! Execute `rustlings hint tests1` for hints :)
-// I AM NOT DONE
#[cfg(test)]
mod tests {
#[test]
fn you_can_assert() {
- assert!();
+ assert!(true);
}
}
diff --git a/exercises/tests/tests2.rs b/exercises/tests/tests2.rs
index 0d981ad..a24f303 100644
--- a/exercises/tests/tests2.rs
+++ b/exercises/tests/tests2.rs
@@ -2,12 +2,12 @@
// This test has a problem with it -- make the test compile! Make the test
// pass! Make the test fail! Execute `rustlings hint tests2` for hints :)
-// I AM NOT DONE
+
#[cfg(test)]
mod tests {
#[test]
fn you_can_assert_eq() {
- assert_eq!();
+ assert_eq!(1,1);
}
}
diff --git a/exercises/tests/tests3.rs b/exercises/tests/tests3.rs
index 693b8aa..683077b 100644
--- a/exercises/tests/tests3.rs
+++ b/exercises/tests/tests3.rs
@@ -4,7 +4,6 @@
// we expect to get when we call `is_even(5)`.
// Execute `rustlings hint tests3` for hints :)
-// I AM NOT DONE
pub fn is_even(num: i32) -> bool {
num % 2 == 0
@@ -16,6 +15,6 @@ mod tests {
#[test]
fn is_true_when_even() {
- assert!();
+ assert!(is_even(32));
}
}
diff --git a/exercises/variables/variables1.rs b/exercises/variables/variables1.rs
index 4a3af73..8dd6937 100644
--- a/exercises/variables/variables1.rs
+++ b/exercises/variables/variables1.rs
@@ -6,9 +6,9 @@
// 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..64b9b35 100644
--- a/exercises/variables/variables2.rs
+++ b/exercises/variables/variables2.rs
@@ -1,10 +1,9 @@
// 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:i8=12;
if x == 10 {
println!("Ten!");
} else {
diff --git a/exercises/variables/variables3.rs b/exercises/variables/variables3.rs
index 07b1a52..5780473 100644
--- a/exercises/variables/variables3.rs
+++ b/exercises/variables/variables3.rs
@@ -1,10 +1,10 @@
// 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;
println!("Number {}", x);
diff --git a/exercises/variables/variables4.rs b/exercises/variables/variables4.rs
index 77f1e9a..a931d14 100644
--- a/exercises/variables/variables4.rs
+++ b/exercises/variables/variables4.rs
@@ -1,9 +1,9 @@
// 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=12;
println!("Number {}", x);
}