From bf160e301c0adb942e51b9dd8a66fc02dc71c682 Mon Sep 17 00:00:00 2001
From: Simon Halimi <halimisimon@gmail.com>
Date: Tue, 13 Apr 2021 17:31:06 +0200
Subject: [PATCH] =?UTF-8?q?quizz=20et=20string=20ajout=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
exercises/quiz2.rs | 22 ++++++++++------------
exercises/strings/strings1.rs | 4 +---
exercises/strings/strings2.rs | 5 +----
3 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/exercises/quiz2.rs b/exercises/quiz2.rs
index de0dce9..613c1d9 100644
--- a/exercises/quiz2.rs
+++ b/exercises/quiz2.rs
@@ -7,8 +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 +15,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/strings/strings1.rs b/exercises/strings/strings1.rs
index 8090244..e43c88a 100644
--- a/exercises/strings/strings1.rs
+++ b/exercises/strings/strings1.rs
@@ -2,13 +2,11 @@
// 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();
println!("My current favorite color is {}", answer);
}
fn current_favorite_color() -> String {
- "blue"
+ String::from("blue")
}
diff --git a/exercises/strings/strings2.rs b/exercises/strings/strings2.rs
index 5a2ce74..64725f5 100644
--- a/exercises/strings/strings2.rs
+++ b/exercises/strings/strings2.rs
@@ -1,12 +1,9 @@
// strings2.rs
// 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.");