From 3f6c73581bd877ca45898efe7c754f15bbd4dba3 Mon Sep 17 00:00:00 2001
From: Jared Moulton <jaredmoulton3@gmail.com>
Date: Fri, 23 Oct 2020 08:19:55 -0600
Subject: [PATCH] Finish through errorsn.rs
---
exercises/enums/enums1.rs | 5 +-
exercises/enums/enums2.rs | 5 +-
exercises/enums/enums3.rs | 46 ++++++++++---------
exercises/error_handling/errors1.rs | 12 +++--
exercises/error_handling/errors2.rs | 3 +-
exercises/error_handling/errors3.rs | 19 ++++----
exercises/error_handling/errorsn.rs | 4 +-
exercises/functions/functions1.rs | 3 +-
exercises/functions/functions2.rs | 3 +-
exercises/functions/functions3.rs | 3 +-
exercises/functions/functions4.rs | 3 +-
exercises/functions/functions5.rs | 3 +-
exercises/if/if1.rs | 6 ++-
exercises/if/if2.rs | 5 +-
exercises/macros/macros1.rs | 5 +-
exercises/macros/macros2.rs | 8 ++--
exercises/macros/macros3.rs | 2 +-
exercises/macros/macros4.rs | 3 +-
exercises/modules/modules1.rs | 3 +-
exercises/modules/modules2.rs | 5 +-
exercises/move_semantics/move_semantics1.rs | 3 +-
exercises/move_semantics/move_semantics2.rs | 7 ++-
exercises/move_semantics/move_semantics3.rs | 3 +-
exercises/move_semantics/move_semantics4.rs | 7 +--
exercises/primitive_types/primitive_types1.rs | 3 +-
exercises/primitive_types/primitive_types2.rs | 3 +-
exercises/primitive_types/primitive_types3.rs | 3 +-
exercises/primitive_types/primitive_types4.rs | 3 +-
exercises/primitive_types/primitive_types5.rs | 3 +-
exercises/primitive_types/primitive_types6.rs | 3 +-
exercises/quiz1.rs | 8 +++-
exercises/quiz2.rs | 21 ++++-----
exercises/quiz3.rs | 4 +-
exercises/quiz4.rs | 7 ++-
exercises/strings/strings1.rs | 3 +-
exercises/strings/strings2.rs | 3 +-
exercises/structs/structs1.rs | 13 ++++--
exercises/structs/structs2.rs | 6 ++-
exercises/structs/structs3.rs | 10 ++--
exercises/tests/tests1.rs | 3 +-
exercises/tests/tests2.rs | 3 +-
exercises/tests/tests3.rs | 5 +-
exercises/variables/variables1.rs | 3 +-
exercises/variables/variables2.rs | 3 +-
exercises/variables/variables3.rs | 3 +-
exercises/variables/variables4.rs | 3 +-
exercises/variables/variables5.rs | 3 +-
exercises/variables/variables6.rs | 3 +-
48 files changed, 149 insertions(+), 139 deletions(-)
diff --git a/exercises/enums/enums1.rs b/exercises/enums/enums1.rs
index a2223d3..4a784d3 100644
--- a/exercises/enums/enums1.rs
+++ b/exercises/enums/enums1.rs
@@ -1,11 +1,14 @@
// 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 ec32d95..f4fa0b0 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: i8, y: i8},
+ Echo(String),
+ ChangeColor(i16, i16, i16),
+ Quit,
}
impl Message {
diff --git a/exercises/enums/enums3.rs b/exercises/enums/enums3.rs
index 178b40c..5413eb6 100644
--- a/exercises/enums/enums3.rs
+++ b/exercises/enums/enums3.rs
@@ -1,42 +1,44 @@
// 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
+// 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 {
x: u8,
- y: u8,
+ y: u8
}
-
struct State {
color: (u8, u8, u8),
position: Point,
- quit: bool,
+ quit: bool
}
-
impl State {
- fn change_color(&mut self, color: (u8, u8, u8)) {
- self.color = color;
+fn change_color(&mut self, color: (u8, u8, u8)) {
+self.color = color;
}
-
- fn quit(&mut self) {
- self.quit = true;
+fn quit(&mut self) {
+self.quit = true;
}
-
- fn echo(&self, s: String) {
- println!("{}", s);
+fn echo(&self, s: String) {
+println!("{}", s);
}
-
- fn move_position(&mut self, p: Point) {
- self.position = p;
+fn move_position(&mut self, p: Point) {
+self.position = p;
}
-
- fn process(&mut self, message: Message) {
- // TODO: create a match expression to process the different message variants
+fn process(&mut self, message: Message) {
+// TODO: create a match expression to process the different message variants
+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()
+ }
}
}
@@ -53,7 +55,7 @@ mod tests {
};
state.process(Message::ChangeColor((255, 0, 255)));
state.process(Message::Echo(String::from("hello world")));
- state.process(Message::Move(Point { x: 10, y: 15 }));
+ state.process(Message::Move { x: 10, y: 15 });
state.process(Message::Quit);
assert_eq!(state.color, (255, 0, 255));
diff --git a/exercises/error_handling/errors1.rs b/exercises/error_handling/errors1.rs
index 9c24d85..bba1903 100644
--- a/exercises/error_handling/errors1.rs
+++ b/exercises/error_handling/errors1.rs
@@ -6,16 +6,18 @@
// this function to have.
// Execute `rustlings hint errors1` for hints!
-// I AM NOT DONE
-pub fn generate_nametag_text(name: String) -> Option<String> {
+pub fn generate_nametag_text(name: String) -> Result<String, String> {
if name.len() > 0 {
- Some(format!("Hi! My name is {}", name))
+ Ok(format!("Hi! My name is {}", name))
} else {
// Empty names aren't allowed.
- None
+ Err(format!("`name` was empty; it must be nonempty."))
}
}
+fn main() {
+ println!("{}", generate_nametag_text("Jared".to_string()).unwrap());
+}
#[cfg(test)]
mod tests {
@@ -28,7 +30,7 @@ mod tests {
fn generates_nametag_text_for_a_nonempty_name() {
assert_eq!(
generate_nametag_text("Beyoncé".into()),
- Some("Hi! My name is Beyoncé".into())
+ Ok("Hi! My name is Beyoncé".into())
);
}
diff --git a/exercises/error_handling/errors2.rs b/exercises/error_handling/errors2.rs
index aad3a93..cfc8537 100644
--- a/exercises/error_handling/errors2.rs
+++ b/exercises/error_handling/errors2.rs
@@ -16,14 +16,13 @@
// There are at least two ways to implement this that are both correct-- but
// one is a lot shorter! Execute `rustlings hint errors2` for hints to both ways.
-// I AM NOT DONE
use std::num::ParseIntError;
pub fn total_cost(item_quantity: &str) -> Result<i32, ParseIntError> {
let processing_fee = 1;
let cost_per_item = 5;
- let qty = item_quantity.parse::<i32>();
+ let qty = item_quantity.parse::<i32>()?;
Ok(qty * cost_per_item + processing_fee)
}
diff --git a/exercises/error_handling/errors3.rs b/exercises/error_handling/errors3.rs
index 460ac5c..9319f31 100644
--- a/exercises/error_handling/errors3.rs
+++ b/exercises/error_handling/errors3.rs
@@ -4,21 +4,22 @@
// Why not? What should we do to fix it?
// Execute `rustlings hint errors3` for hints!
-// I AM NOT DONE
-
use std::num::ParseIntError;
fn main() {
let mut tokens = 100;
let pretend_user_input = "8";
- let cost = total_cost(pretend_user_input)?;
-
- if cost > tokens {
- println!("You can't afford that many!");
- } else {
- tokens -= cost;
- println!("You now have {} tokens.", tokens);
+ match total_cost(pretend_user_input) {
+ Ok(cost) => {
+ if cost > tokens {
+ println!("You can't afford that many!");
+ } else {
+ tokens -= cost;
+ println!("You now have {} tokens.", tokens);
+ }
+ }
+ Err(e) => panic!(e),
}
}
diff --git a/exercises/error_handling/errorsn.rs b/exercises/error_handling/errorsn.rs
index 5fe212b..d85db03 100644
--- a/exercises/error_handling/errorsn.rs
+++ b/exercises/error_handling/errorsn.rs
@@ -24,7 +24,9 @@ use std::fmt;
use std::io;
// PositiveNonzeroInteger is a struct defined below the tests.
-fn read_and_validate(b: &mut dyn io::BufRead) -> Result<PositiveNonzeroInteger, ???> {
+fn read_and_validate(
+ b: &mut dyn io::BufRead,
+) -> Result<PositiveNonzeroInteger, Box<dyn error::Error>> {
let mut line = String::new();
b.read_line(&mut line);
let num: i64 = line.trim().parse();
diff --git a/exercises/functions/functions1.rs b/exercises/functions/functions1.rs
index 3112527..1f61878 100644
--- a/exercises/functions/functions1.rs
+++ b/exercises/functions/functions1.rs
@@ -1,7 +1,8 @@
// 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..eab6fca 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..aad88cd 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(5);
}
fn call_me(num: i32) {
diff --git a/exercises/functions/functions4.rs b/exercises/functions/functions4.rs
index 58637e4..2d28441 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 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..ee79e79 100644
--- a/exercises/functions/functions5.rs
+++ b/exercises/functions/functions5.rs
@@ -1,7 +1,6 @@
// functions5.rs
// Make me compile! Execute `rustlings hint functions5` for hints :)
-// I AM NOT DONE
fn main() {
let answer = square(3);
@@ -9,5 +8,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 9086754..1f1e261 100644
--- a/exercises/if/if1.rs
+++ b/exercises/if/if1.rs
@@ -1,6 +1,5 @@
// if1.rs
-// I AM NOT DONE
pub fn bigger(a: i32, b: i32) -> i32 {
// Complete this function to return the bigger number!
@@ -8,6 +7,11 @@ pub fn bigger(a: i32, b: i32) -> i32 {
// - another function call
// - additional variables
// Execute `rustlings hint if1` for hints
+ if a > b {
+ return a;
+ } else {
+ return b;
+ }
}
// Don't mind this for now :)
diff --git a/exercises/if/if2.rs b/exercises/if/if2.rs
index 80effbd..4d1ab2d 100644
--- a/exercises/if/if2.rs
+++ b/exercises/if/if2.rs
@@ -4,13 +4,14 @@
// 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/macros/macros1.rs b/exercises/macros/macros1.rs
index ed0dac8..8e1e5eb 100644
--- a/exercises/macros/macros1.rs
+++ b/exercises/macros/macros1.rs
@@ -1,7 +1,6 @@
// macros1.rs
-// Make me compile! Execute `rustlings hint macros1` for hints :)
+// Make me compile! Scroll down for hints :)
-// I AM NOT DONE
macro_rules! 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..a563b5d 100644
--- a/exercises/macros/macros2.rs
+++ b/exercises/macros/macros2.rs
@@ -1,14 +1,14 @@
// macros2.rs
// Make me compile! Execute `rustlings hint macros2` for hints :)
-// I AM NOT DONE
-fn main() {
- my_macro!();
-}
macro_rules! my_macro {
() => {
println!("Check out my macro!");
};
}
+
+fn main() {
+ my_macro!();
+}
diff --git a/exercises/macros/macros3.rs b/exercises/macros/macros3.rs
index 93a4311..c1ee00d 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 {
() => {
diff --git a/exercises/macros/macros4.rs b/exercises/macros/macros4.rs
index 3a74807..066048e 100644
--- a/exercises/macros/macros4.rs
+++ b/exercises/macros/macros4.rs
@@ -1,12 +1,11 @@
// 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..c76b058 100644
--- a/exercises/modules/modules1.rs
+++ b/exercises/modules/modules1.rs
@@ -1,10 +1,9 @@
// 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..00bb1a2 100644
--- a/exercises/modules/modules2.rs
+++ b/exercises/modules/modules2.rs
@@ -1,11 +1,10 @@
// 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/move_semantics/move_semantics2.rs b/exercises/move_semantics/move_semantics2.rs
index bd21fbb..9d0a25a 100644
--- a/exercises/move_semantics/move_semantics2.rs
+++ b/exercises/move_semantics/move_semantics2.rs
@@ -2,12 +2,11 @@
// Make me compile without changing line 13!
// Execute `rustlings hint move_semantics2` for hints :)
-// I AM NOT DONE
fn main() {
let vec0 = Vec::new();
- let mut vec1 = fill_vec(vec0);
+ let mut vec1 = fill_vec(&vec0);
// Do not change the following line!
println!("{} has length {} content `{:?}`", "vec0", vec0.len(), vec0);
@@ -17,8 +16,8 @@ fn main() {
println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
}
-fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
- let mut vec = vec;
+fn fill_vec(vec: &Vec<i32>) -> Vec<i32> {
+ let mut vec = vec.to_vec();
vec.push(22);
vec.push(44);
diff --git a/exercises/move_semantics/move_semantics3.rs b/exercises/move_semantics/move_semantics3.rs
index 43fef74..38ae109 100644
--- a/exercises/move_semantics/move_semantics3.rs
+++ b/exercises/move_semantics/move_semantics3.rs
@@ -3,7 +3,6 @@
// (no lines with multiple semicolons necessary!)
// Execute `rustlings hint move_semantics3` for hints :)
-// I AM NOT DONE
fn main() {
let vec0 = Vec::new();
@@ -17,7 +16,7 @@ fn main() {
println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
}
-fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
+fn fill_vec(mut vec: Vec<i32>) -> Vec<i32> {
vec.push(22);
vec.push(44);
vec.push(66);
diff --git a/exercises/move_semantics/move_semantics4.rs b/exercises/move_semantics/move_semantics4.rs
index a1c4a41..17983c5 100644
--- a/exercises/move_semantics/move_semantics4.rs
+++ b/exercises/move_semantics/move_semantics4.rs
@@ -4,12 +4,9 @@
// freshly created vector from fill_vec to its caller.
// Execute `rustlings hint move_semantics4` for hints!
-// I AM NOT DONE
fn main() {
- let vec0 = Vec::new();
-
- let mut vec1 = fill_vec(vec0);
+ let mut vec1 = fill_vec();
println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
@@ -20,7 +17,7 @@ fn main() {
// `fill_vec()` no longer take `vec: Vec<i32>` as argument
fn fill_vec() -> Vec<i32> {
- let mut vec = vec;
+ let mut vec: Vec<i32> = Vec::new();
vec.push(22);
vec.push(44);
diff --git a/exercises/primitive_types/primitive_types1.rs b/exercises/primitive_types/primitive_types1.rs
index 0912139..1f6005f 100644
--- a/exercises/primitive_types/primitive_types1.rs
+++ b/exercises/primitive_types/primitive_types1.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() {
// Booleans (`bool`)
@@ -12,7 +11,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;
if is_evening {
println!("Good evening!");
}
diff --git a/exercises/primitive_types/primitive_types2.rs b/exercises/primitive_types/primitive_types2.rs
index 6576a4d..2b4c383 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,7 @@ fn main() {
println!("Neither alphabetic nor numeric!");
}
- let // Finish this line like the example! What's your favorite character?
+ let your_character = 'B'; // 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..107e5d2 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,2,3,4,5];
if a.len() >= 100 {
println!("Wow, that's a big array!");
diff --git a/exercises/primitive_types/primitive_types4.rs b/exercises/primitive_types/primitive_types4.rs
index 10b553e..df54dff 100644
--- a/exercises/primitive_types/primitive_types4.rs
+++ b/exercises/primitive_types/primitive_types4.rs
@@ -2,13 +2,12 @@
// 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..9358d7e 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/quiz1.rs b/exercises/quiz1.rs
index 5c5c355..ecfd952 100644
--- a/exercises/quiz1.rs
+++ b/exercises/quiz1.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 {
+ num
+ } else {
+ num * 2
+ }
+}
// Don't modify this function!
#[test]
diff --git a/exercises/quiz2.rs b/exercises/quiz2.rs
index de0dce9..c6f2b79 100644
--- a/exercises/quiz2.rs
+++ b/exercises/quiz2.rs
@@ -7,7 +7,6 @@
// 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);
@@ -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/quiz3.rs b/exercises/quiz3.rs
index a0cd371..12db9b8 100644
--- a/exercises/quiz3.rs
+++ b/exercises/quiz3.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/quiz4.rs b/exercises/quiz4.rs
index 6c47480..4c51ed9 100644
--- a/exercises/quiz4.rs
+++ b/exercises/quiz4.rs
@@ -4,8 +4,13 @@
// - Macros
// Write a macro that passes the quiz! No hints this time, you can do it!
+macro_rules! my_macro {
+ ($val:expr) => {
+ format!("Hello {}", $val);
+ }
+}
+
-// I AM NOT DONE
#[cfg(test)]
mod tests {
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..4200f69 100644
--- a/exercises/strings/strings2.rs
+++ b/exercises/strings/strings2.rs
@@ -2,11 +2,10 @@
// 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 :)
- 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/structs/structs1.rs b/exercises/structs/structs1.rs
index 6d0b2f4..7db0bbe 100644
--- a/exercises/structs/structs1.rs
+++ b/exercises/structs/structs1.rs
@@ -1,13 +1,14 @@
// structs1.rs
// Address all the TODOs to make the tests pass!
-// I AM NOT DONE
struct ColorClassicStruct {
- // TODO: Something goes here
+ // TODO: omething goes here
+ name: String,
+ hex: String
}
-struct ColorTupleStruct(/* TODO: Something goes here */);
+struct ColorTupleStruct(String, String);
#[derive(Debug)]
struct UnitStruct;
@@ -20,6 +21,10 @@ mod tests {
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");
@@ -29,6 +34,7 @@ mod tests {
fn tuple_structs() {
// TODO: Instantiate a tuple struct!
// let green =
+ let green = ColorTupleStruct("green".to_string(), "#00FF00".to_string());
assert_eq!(green.0, "green");
assert_eq!(green.1, "#00FF00");
@@ -38,6 +44,7 @@ mod tests {
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 f9c6427..5b190dc 100644
--- a/exercises/structs/structs2.rs
+++ b/exercises/structs/structs2.rs
@@ -1,7 +1,6 @@
// structs2.rs
// Address all the TODOs to make the tests pass!
-// I AM NOT DONE
#[derive(Debug)]
struct Order {
@@ -35,6 +34,11 @@ mod tests {
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,
+ ..create_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/structs/structs3.rs b/exercises/structs/structs3.rs
index 06fcaf2..fcae4b7 100644
--- a/exercises/structs/structs3.rs
+++ b/exercises/structs/structs3.rs
@@ -3,7 +3,6 @@
// exercise we have defined the Package struct and we want to test some logic attached to it,
// make the code compile and the tests pass! If you have issues execute `rustlings hint structs3`
-// I AM NOT DONE
#[derive(Debug)]
struct Package {
@@ -16,6 +15,7 @@ impl Package {
fn new(sender_country: String, recipient_country: String, weight_in_grams: i32) -> Package {
if weight_in_grams <= 0 {
// Something goes here...
+ panic!("crash and burn");
} else {
return Package {
sender_country,
@@ -25,12 +25,14 @@ impl Package {
}
}
- fn is_international(&self) -> ??? {
+ fn is_international(&self) -> bool {
// Something goes here...
+ true
}
- fn get_fees(&self, cents_per_gram: i32) -> ??? {
+ fn get_fees(&self, cents_per_gram: i32) -> i32 {
// Something goes here...
+ cents_per_gram * self.weight_in_grams
}
}
@@ -62,7 +64,7 @@ mod tests {
let sender_country = String::from("Spain");
let recipient_country = String::from("Spain");
- let cents_per_gram = ???;
+ let cents_per_gram = 3;
let package = Package::new(sender_country, recipient_country, 1500);
diff --git a/exercises/tests/tests1.rs b/exercises/tests/tests1.rs
index 50586a1..955f423 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..93594f9 100644
--- a/exercises/tests/tests2.rs
+++ b/exercises/tests/tests2.rs
@@ -2,12 +2,11 @@
// 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!(15, 15);
}
}
diff --git a/exercises/tests/tests3.rs b/exercises/tests/tests3.rs
index 06cf7ea..56bf0b7 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,11 +15,11 @@ mod tests {
#[test]
fn is_true_when_even() {
- assert!();
+ assert!(is_even(6));
}
#[test]
fn is_false_when_even() {
- assert!();
+ assert!(!is_even(5));
}
}
diff --git a/exercises/variables/variables1.rs b/exercises/variables/variables1.rs
index 4a3af73..149d5ce 100644
--- a/exercises/variables/variables1.rs
+++ b/exercises/variables/variables1.rs
@@ -6,9 +6,8 @@
// 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..be2ca14 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 = 10;
if x == 10 {
println!("Ten!");
} else {
diff --git a/exercises/variables/variables3.rs b/exercises/variables/variables3.rs
index 30ec48f..3566ef2 100644
--- a/exercises/variables/variables3.rs
+++ b/exercises/variables/variables3.rs
@@ -1,10 +1,9 @@
// 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..ee24119 100644
--- a/exercises/variables/variables4.rs
+++ b/exercises/variables/variables4.rs
@@ -1,9 +1,8 @@
// 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 = 100;
println!("Number {}", x);
}
diff --git a/exercises/variables/variables5.rs b/exercises/variables/variables5.rs
index da37ae9..bb8abce 100644
--- a/exercises/variables/variables5.rs
+++ b/exercises/variables/variables5.rs
@@ -1,11 +1,10 @@
// 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..d4017ef 100644
--- a/exercises/variables/variables6.rs
+++ b/exercises/variables/variables6.rs
@@ -1,9 +1,8 @@
// 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);
}