diff --git a/exercises/clippy/clippy2.rs b/exercises/clippy/clippy2.rs index dac40dbe..af434217 100644 --- a/exercises/clippy/clippy2.rs +++ b/exercises/clippy/clippy2.rs @@ -9,5 +9,5 @@ fn main() { for x in option { res += x; } - println!("{}", res); + println!("{res}"); } diff --git a/exercises/clippy/clippy3.rs b/exercises/clippy/clippy3.rs index b0159ebe..db62f01c 100644 --- a/exercises/clippy/clippy3.rs +++ b/exercises/clippy/clippy3.rs @@ -14,15 +14,15 @@ fn main() { -1, -2, -3 -4, -5, -6 ]; - println!("My array! Here it is: {:?}", my_arr); + println!("My array! Here it is: {my_arr:?}"); let my_empty_vec = vec![1, 2, 3, 4, 5].resize(0, 5); - println!("This Vec is empty, see? {:?}", my_empty_vec); + println!("This Vec is empty, see? {my_empty_vec:?}"); let mut value_a = 45; let mut value_b = 66; // Let's swap these two! value_a = value_b; value_b = value_a; - println!("value a: {}; value b: {}", value_a, value_b); + println!("value a: {value_a}; value b: {value_b}"); } diff --git a/exercises/conversions/from_str.rs b/exercises/conversions/from_str.rs index fe168159..efd93246 100644 --- a/exercises/conversions/from_str.rs +++ b/exercises/conversions/from_str.rs @@ -51,7 +51,7 @@ impl FromStr for Person { fn main() { let p = "Mark,20".parse::().unwrap(); - println!("{:?}", p); + println!("{p:?}"); } #[cfg(test)] diff --git a/exercises/enums/enums3.rs b/exercises/enums/enums3.rs index a2a9d586..d8198623 100644 --- a/exercises/enums/enums3.rs +++ b/exercises/enums/enums3.rs @@ -29,7 +29,7 @@ impl State { } fn echo(&self, s: String) { - println!("{}", s); + println!("{s}"); } fn move_position(&mut self, p: Point) { diff --git a/exercises/error_handling/errors1.rs b/exercises/error_handling/errors1.rs index bcee9723..b6035ffd 100644 --- a/exercises/error_handling/errors1.rs +++ b/exercises/error_handling/errors1.rs @@ -12,7 +12,7 @@ pub fn generate_nametag_text(name: String) -> Option { // Empty names aren't allowed. None } else { - Some(format!("Hi! My name is {}", name)) + Some(format!("Hi! My name is {name}")) } } diff --git a/exercises/error_handling/errors3.rs b/exercises/error_handling/errors3.rs index a2d2d190..6c8a1951 100644 --- a/exercises/error_handling/errors3.rs +++ b/exercises/error_handling/errors3.rs @@ -18,7 +18,7 @@ fn main() { println!("You can't afford that many!"); } else { tokens -= cost; - println!("You now have {} tokens.", tokens); + println!("You now have {tokens} tokens."); } } diff --git a/exercises/functions/functions5.rs b/exercises/functions/functions5.rs index 5d762961..185f32bd 100644 --- a/exercises/functions/functions5.rs +++ b/exercises/functions/functions5.rs @@ -5,7 +5,7 @@ fn main() { let answer = square(3); - println!("The square of 3 is {}", answer); + println!("The square of 3 is {answer}"); } fn square(num: i32) -> i32 { diff --git a/exercises/lifetimes/lifetimes1.rs b/exercises/lifetimes/lifetimes1.rs index 0236470d..0941b874 100644 --- a/exercises/lifetimes/lifetimes1.rs +++ b/exercises/lifetimes/lifetimes1.rs @@ -22,5 +22,5 @@ fn main() { let string2 = "xyz"; let result = longest(string1.as_str(), string2); - println!("The longest string is '{}'", result); + println!("The longest string is '{result}'"); } diff --git a/exercises/lifetimes/lifetimes2.rs b/exercises/lifetimes/lifetimes2.rs index b48feabc..885ca546 100644 --- a/exercises/lifetimes/lifetimes2.rs +++ b/exercises/lifetimes/lifetimes2.rs @@ -23,5 +23,5 @@ fn main() { let string2 = String::from("xyz"); result = longest(string1.as_str(), string2.as_str()); } - println!("The longest string is '{}'", result); + println!("The longest string is '{result}'"); } diff --git a/exercises/move_semantics/move_semantics1.rs b/exercises/move_semantics/move_semantics1.rs index aac6dfc3..ac7804f5 100644 --- a/exercises/move_semantics/move_semantics1.rs +++ b/exercises/move_semantics/move_semantics1.rs @@ -8,11 +8,11 @@ fn main() { let vec1 = fill_vec(vec0); - println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1); + println!("{} has length {} content `{vec1:?}`", "vec1", vec1.len()); vec1.push(88); - println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1); + println!("{} has length {} content `{vec1:?}`", "vec1", vec1.len()); } fn fill_vec(vec: Vec) -> Vec { diff --git a/exercises/move_semantics/move_semantics2.rs b/exercises/move_semantics/move_semantics2.rs index 64870850..ac3a615b 100644 --- a/exercises/move_semantics/move_semantics2.rs +++ b/exercises/move_semantics/move_semantics2.rs @@ -10,11 +10,11 @@ fn main() { let mut vec1 = fill_vec(vec0); // Do not change the following line! - println!("{} has length {} content `{:?}`", "vec0", vec0.len(), vec0); + println!("{} has length {} content `{vec0:?}`", "vec0", vec0.len()); vec1.push(88); - println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1); + println!("{} has length {} content `{vec1:?}`", "vec1", vec1.len()); } fn fill_vec(vec: Vec) -> Vec { diff --git a/exercises/move_semantics/move_semantics3.rs b/exercises/move_semantics/move_semantics3.rs index eaa30e33..ea23d9b7 100644 --- a/exercises/move_semantics/move_semantics3.rs +++ b/exercises/move_semantics/move_semantics3.rs @@ -10,11 +10,11 @@ fn main() { let mut vec1 = fill_vec(vec0); - println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1); + println!("{} has length {} content `{vec1:?}`", "vec1", vec1.len()); vec1.push(88); - println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1); + println!("{} has length {} content `{vec1:?}`", "vec1", vec1.len()); } fn fill_vec(vec: Vec) -> Vec { diff --git a/exercises/move_semantics/move_semantics4.rs b/exercises/move_semantics/move_semantics4.rs index 99834ec3..e5b9b3e2 100644 --- a/exercises/move_semantics/move_semantics4.rs +++ b/exercises/move_semantics/move_semantics4.rs @@ -11,11 +11,11 @@ fn main() { let mut vec1 = fill_vec(vec0); - println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1); + println!("{} has length {} content `{vec1:?}`", "vec1", vec1.len()); vec1.push(88); - println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1); + println!("{} has length {} content `{vec1:?}`", "vec1", vec1.len()); } // `fill_vec()` no longer takes `vec: Vec` as argument diff --git a/exercises/move_semantics/move_semantics6.rs b/exercises/move_semantics/move_semantics6.rs index eb52a848..b7b04ada 100644 --- a/exercises/move_semantics/move_semantics6.rs +++ b/exercises/move_semantics/move_semantics6.rs @@ -21,5 +21,5 @@ fn get_char(data: String) -> char { fn string_uppercase(mut data: &String) { data = &data.to_uppercase(); - println!("{}", data); + println!("{data}"); } diff --git a/exercises/primitive_types/primitive_types5.rs b/exercises/primitive_types/primitive_types5.rs index 4fd9141f..2255d5fc 100644 --- a/exercises/primitive_types/primitive_types5.rs +++ b/exercises/primitive_types/primitive_types5.rs @@ -8,5 +8,5 @@ fn main() { let cat = ("Furry McFurson", 3.5); let /* your pattern here */ = cat; - println!("{} is {} years old.", name, age); + println!("{name} is {age} years old."); } diff --git a/exercises/smart_pointers/arc1.rs b/exercises/smart_pointers/arc1.rs index 93a27036..7697c93e 100644 --- a/exercises/smart_pointers/arc1.rs +++ b/exercises/smart_pointers/arc1.rs @@ -33,7 +33,7 @@ fn main() { let child_numbers = // TODO joinhandles.push(thread::spawn(move || { let sum: u32 = child_numbers.iter().filter(|n| *n % 8 == offset).sum(); - println!("Sum of offset {} is {}", offset, sum); + println!("Sum of offset {offset} is {sum}"); })); } for handle in joinhandles.into_iter() { diff --git a/exercises/smart_pointers/rc1.rs b/exercises/smart_pointers/rc1.rs index d62f3619..50a25ccb 100644 --- a/exercises/smart_pointers/rc1.rs +++ b/exercises/smart_pointers/rc1.rs @@ -26,7 +26,7 @@ enum Planet { impl Planet { fn details(&self) { - println!("Hi from {:?}!", self) + println!("Hi from {self:?}!") } } diff --git a/exercises/strings/strings1.rs b/exercises/strings/strings1.rs index 0de86a1d..cec48a15 100644 --- a/exercises/strings/strings1.rs +++ b/exercises/strings/strings1.rs @@ -6,7 +6,7 @@ fn main() { let answer = current_favorite_color(); - println!("My current favorite color is {}", answer); + println!("My current favorite color is {answer}"); } fn current_favorite_color() -> String { diff --git a/exercises/strings/strings4.rs b/exercises/strings/strings4.rs index c410b562..4a56fb3e 100644 --- a/exercises/strings/strings4.rs +++ b/exercises/strings/strings4.rs @@ -9,10 +9,10 @@ // I AM NOT DONE fn string_slice(arg: &str) { - println!("{}", arg); + println!("{arg}"); } fn string(arg: String) { - println!("{}", arg); + println!("{arg}"); } fn main() { diff --git a/exercises/structs/structs1.rs b/exercises/structs/structs1.rs index 0d91c469..5fe0b712 100644 --- a/exercises/structs/structs1.rs +++ b/exercises/structs/structs1.rs @@ -41,7 +41,7 @@ mod tests { fn unit_structs() { // TODO: Instantiate a unit-like struct! // let unit_like_struct = - let message = format!("{:?}s are fun!", unit_like_struct); + let message = format!("{unit_like_struct:?}s are fun!"); assert_eq!(message, "UnitLikeStructs are fun!"); } diff --git a/exercises/threads/threads1.rs b/exercises/threads/threads1.rs index e59f4ce4..fbcccacd 100644 --- a/exercises/threads/threads1.rs +++ b/exercises/threads/threads1.rs @@ -14,7 +14,7 @@ fn main() { for i in 0..10 { thread::spawn(move || { thread::sleep(Duration::from_millis(250)); - println!("thread {} is complete", i); + println!("thread {i} is complete"); }); } diff --git a/exercises/threads/threads3.rs b/exercises/threads/threads3.rs index 9e9f285a..b277855a 100644 --- a/exercises/threads/threads3.rs +++ b/exercises/threads/threads3.rs @@ -31,7 +31,7 @@ fn send_tx(q: Queue, tx: mpsc::Sender) -> () { thread::spawn(move || { for val in &qc1.first_half { - println!("sending {:?}", val); + println!("sending {val:?}"); tx.send(*val).unwrap(); thread::sleep(Duration::from_secs(1)); } @@ -39,7 +39,7 @@ fn send_tx(q: Queue, tx: mpsc::Sender) -> () { thread::spawn(move || { for val in &qc2.second_half { - println!("sending {:?}", val); + println!("sending {val:?}"); tx.send(*val).unwrap(); thread::sleep(Duration::from_secs(1)); } @@ -55,10 +55,10 @@ fn main() { let mut total_received: u32 = 0; for received in rx { - println!("Got: {}", received); + println!("Got: {received}"); total_received += 1; } - println!("total numbers received: {}", total_received); + println!("total numbers received: {total_received:?}"); assert_eq!(total_received, queue_length) } diff --git a/exercises/traits/traits1.rs b/exercises/traits/traits1.rs index f5320a5a..66908ecb 100644 --- a/exercises/traits/traits1.rs +++ b/exercises/traits/traits1.rs @@ -22,7 +22,7 @@ impl AppendBar for String { fn main() { let s = String::from("Foo"); let s = s.append_bar(); - println!("s: {}", s); + println!("s: {s}"); } #[cfg(test)] diff --git a/exercises/variables/variables1.rs b/exercises/variables/variables1.rs index f4d182ac..9525b8e3 100644 --- a/exercises/variables/variables1.rs +++ b/exercises/variables/variables1.rs @@ -6,5 +6,5 @@ fn main() { x = 5; - println!("x has the value {}", x); + println!("x has the value {x}"); } diff --git a/exercises/variables/variables3.rs b/exercises/variables/variables3.rs index 819b1bc7..47992f88 100644 --- a/exercises/variables/variables3.rs +++ b/exercises/variables/variables3.rs @@ -5,5 +5,5 @@ fn main() { let x: i32; - println!("Number {}", x); + println!("Number {x}"); } diff --git a/exercises/variables/variables4.rs b/exercises/variables/variables4.rs index 54491b0a..d762368c 100644 --- a/exercises/variables/variables4.rs +++ b/exercises/variables/variables4.rs @@ -5,7 +5,7 @@ fn main() { let x = 3; - println!("Number {}", x); + println!("Number {x}"); x = 5; // don't change this line - println!("Number {}", x); + println!("Number {x}"); } diff --git a/exercises/variables/variables5.rs b/exercises/variables/variables5.rs index 0e670d2a..dec4c4f6 100644 --- a/exercises/variables/variables5.rs +++ b/exercises/variables/variables5.rs @@ -5,7 +5,7 @@ fn main() { let number = "T-H-R-E-E"; // don't change this line - println!("Spell a Number : {}", number); + println!("Spell a Number : {number}"); number = 3; // don't rename this variable println!("Number plus two is : {}", number + 2); } diff --git a/exercises/variables/variables6.rs b/exercises/variables/variables6.rs index a8520122..7e8f5c32 100644 --- a/exercises/variables/variables6.rs +++ b/exercises/variables/variables6.rs @@ -5,5 +5,5 @@ const NUMBER = 3; fn main() { - println!("Number {}", NUMBER); + println!("Number {NUMBER}"); }