diff --git a/exercises/clippy/clippy1.rs b/exercises/clippy/clippy1.rs
index bdb5dd2..7b36e78 100644
--- a/exercises/clippy/clippy1.rs
+++ b/exercises/clippy/clippy1.rs
@@ -6,12 +6,10 @@
// check clippy's suggestions from the output to solve the exercise.
// Execute `rustlings hint clippy1` for hints :)
-// I AM NOT DONE
-
fn main() {
let x = 1.2331f64;
let y = 1.2332f64;
- if y != x {
+ if (y - x).abs() != 0.0 {
println!("Success!");
}
}
diff --git a/exercises/clippy/clippy2.rs b/exercises/clippy/clippy2.rs
index 37af9ed..4cdfbe7 100644
--- a/exercises/clippy/clippy2.rs
+++ b/exercises/clippy/clippy2.rs
@@ -1,12 +1,10 @@
// clippy2.rs
// Make me compile! Execute `rustlings hint clippy2` for hints :)
-// I AM NOT DONE
-
fn main() {
let mut res = 42;
let option = Some(12);
- for x in option {
+ if let Some(x) = option {
res += x;
}
println!("{}", res);
diff --git a/exercises/conversions/as_ref_mut.rs b/exercises/conversions/as_ref_mut.rs
index 84f4a60..f1e5072 100644
--- a/exercises/conversions/as_ref_mut.rs
+++ b/exercises/conversions/as_ref_mut.rs
@@ -2,17 +2,15 @@
// Read more about them at https://doc.rust-lang.org/std/convert/trait.AsRef.html
// and https://doc.rust-lang.org/std/convert/trait.AsMut.html, respectively.
-// I AM NOT DONE
-
// Obtain the number of bytes (not characters) in the given argument
// Add the AsRef trait appropriately as a trait bound
-fn byte_counter<T>(arg: T) -> usize {
+fn byte_counter<T: AsRef<str>>(arg: T) -> usize {
arg.as_ref().as_bytes().len()
}
// Obtain the number of characters (not bytes) in the given argument
// Add the AsRef trait appropriately as a trait bound
-fn char_counter<T>(arg: T) -> usize {
+fn char_counter<T: AsRef<str>>(arg: T) -> usize {
arg.as_ref().chars().count()
}
diff --git a/exercises/conversions/from_into.rs b/exercises/conversions/from_into.rs
index f24cf61..f5a76d0 100644
--- a/exercises/conversions/from_into.rs
+++ b/exercises/conversions/from_into.rs
@@ -37,6 +37,18 @@ impl Default for Person {
impl From<&str> for Person {
fn from(s: &str) -> Person {
+ let person: Vec<&str> = s.split(",").collect();
+
+ match person.len() {
+ 2 => match person[0].to_owned().len() {
+ 0 => Err(String::from("Error")),
+ _ => Ok(Person {
+ name: person[0].to_owned(),
+ age: person[1].parse::<usize>().unwrap(),
+ }),
+ },
+ _ => Err(String::from("Error")),
+ }
}
}
diff --git a/exercises/conversions/from_str.rs b/exercises/conversions/from_str.rs
index af9eee6..b37a2e1 100644
--- a/exercises/conversions/from_str.rs
+++ b/exercises/conversions/from_str.rs
@@ -10,7 +10,6 @@ struct Person {
age: usize,
}
-// I AM NOT DONE
// Steps:
// 1. If the length of the provided string is 0, then return an error
// 2. Split the given string on the commas present in it
@@ -23,6 +22,18 @@ struct Person {
impl FromStr for Person {
type Err = String;
fn from_str(s: &str) -> Result<Person, Self::Err> {
+ let person: Vec<&str> = s.split(",").collect();
+
+ match person.len() {
+ 2 => match person[0].to_owned().len() {
+ 0 => Err(String::from("Error")),
+ _ => Ok(Person {
+ name: person[0].to_owned(),
+ age: person[1].parse::<usize>().unwrap(),
+ }),
+ },
+ _ => Err(String::from("Error")),
+ }
}
}
diff --git a/exercises/conversions/try_from_into.rs b/exercises/conversions/try_from_into.rs
index e405c3f..10ead58 100644
--- a/exercises/conversions/try_from_into.rs
+++ b/exercises/conversions/try_from_into.rs
@@ -11,8 +11,6 @@ struct Color {
blue: u8,
}
-// I AM NOT DONE
-
// Your task is to complete this implementation
// and return an Ok result of inner type Color.
// You need to create an implementation for a tuple of three integers,
@@ -25,19 +23,56 @@ struct Color {
// Tuple implementation
impl TryFrom<(i16, i16, i16)> for Color {
type Error = String;
- fn try_from(tuple: (i16, i16, i16)) -> Result<Self, Self::Error> {}
+ fn try_from(tuple: (i16, i16, i16)) -> Result<Self, Self::Error> {
+ let (r, g, b) = tuple;
+ if (0..=255).contains(&r) && (0..=255).contains(&g) && (0..=255).contains(&b) {
+ Ok(Color {
+ red: r as u8,
+ green: g as u8,
+ blue: b as u8,
+ })
+ } else {
+ Err(String::from("Error occured."))
+ }
+ }
}
// Array implementation
impl TryFrom<[i16; 3]> for Color {
type Error = String;
- fn try_from(arr: [i16; 3]) -> Result<Self, Self::Error> {}
+ fn try_from(arr: [i16; 3]) -> Result<Self, Self::Error> {
+ if (0..=255).contains(&arr[0]) && (0..=255).contains(&arr[1]) && (0..=255).contains(&arr[2])
+ {
+ Ok(Color {
+ red: arr[0] as u8,
+ green: arr[1] as u8,
+ blue: arr[2] as u8,
+ })
+ } else {
+ Err(String::from("Error occured."))
+ }
+ }
}
// Slice implementation
impl TryFrom<&[i16]> for Color {
type Error = String;
- fn try_from(slice: &[i16]) -> Result<Self, Self::Error> {}
+ fn try_from(slice: &[i16]) -> Result<Self, Self::Error> {
+ if slice.len() != 3 {
+ Err(String::from("Length should be 3."))
+ } else if (0..=255).contains(&slice[0])
+ && (0..=255).contains(&slice[1])
+ && (0..=255).contains(&slice[2])
+ {
+ Ok(Color {
+ red: slice[0] as u8,
+ green: slice[1] as u8,
+ blue: slice[2] as u8,
+ })
+ } else {
+ Err(String::from("Error occured."))
+ }
+ }
}
fn main() {
diff --git a/exercises/conversions/using_as.rs b/exercises/conversions/using_as.rs
index 821309e..f4a33ab 100644
--- a/exercises/conversions/using_as.rs
+++ b/exercises/conversions/using_as.rs
@@ -5,11 +5,9 @@
// The goal is to make sure that the division does not fail to compile
// and returns the proper type.
-// I AM NOT DONE
-
fn average(values: &[f64]) -> f64 {
let total = values.iter().fold(0.0, |a, b| a + b);
- total / values.len()
+ total / values.len() as f64
}
fn main() {
diff --git a/exercises/quiz4.rs b/exercises/quiz4.rs
index 8bcfb4d..0ac8372 100644
--- a/exercises/quiz4.rs
+++ b/exercises/quiz4.rs
@@ -5,7 +5,6 @@
// Write a macro that passes the quiz! No hints this time, you can do it!
-// I AM NOT DONE
#[macro_use]
mod macros {
macro_rules! my_macro {