From 7e7d015a25194e7fa5d1ec3ec2bfe4ccde43f6bb Mon Sep 17 00:00:00 2001 From: Folkert de Vries Date: Thu, 19 Sep 2024 17:00:12 +0200 Subject: [PATCH] formatting --- .../1-basic-syntax/1-basic-syntax/src/bin/05.rs | 6 +++--- .../1-move-semantics/src/bin/04.rs | 8 ++------ .../3-advanced-syntax/3-slices/src/main.rs | 13 ++++++++----- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/exercises/2-foundations-of-rust/1-basic-syntax/1-basic-syntax/src/bin/05.rs b/exercises/2-foundations-of-rust/1-basic-syntax/1-basic-syntax/src/bin/05.rs index faacb16..dae2e55 100644 --- a/exercises/2-foundations-of-rust/1-basic-syntax/1-basic-syntax/src/bin/05.rs +++ b/exercises/2-foundations-of-rust/1-basic-syntax/1-basic-syntax/src/bin/05.rs @@ -1,10 +1,10 @@ fn main() { - let data = [22, 12, 13, 17, 18]; + let mut data = [22, 12, 13, 17, 18]; for i in 0..5 { - data.i = floored_half(data.i); + data[i] = floored_half(data[i]); } } -fn floored_half(data: i32) { +fn floored_half(data: i32) -> i32 { data / 2 } diff --git a/exercises/2-foundations-of-rust/2-ownership-and-references/1-move-semantics/src/bin/04.rs b/exercises/2-foundations-of-rust/2-ownership-and-references/1-move-semantics/src/bin/04.rs index 8631c1a..3dd014a 100644 --- a/exercises/2-foundations-of-rust/2-ownership-and-references/1-move-semantics/src/bin/04.rs +++ b/exercises/2-foundations-of-rust/2-ownership-and-references/1-move-semantics/src/bin/04.rs @@ -3,9 +3,7 @@ //! function. fn main() { - let s0 = String::new(); - - let mut s1 = create_string(s0); + let mut s1 = create_string(); println!("{} == `{}`", stringify!(s1), s1); @@ -16,7 +14,5 @@ fn main() { ///`create_string()` no longer takes `s: String` as argument fn create_string() -> String { - let mut s = s; - - s + String::new() } diff --git a/exercises/2-foundations-of-rust/3-advanced-syntax/3-slices/src/main.rs b/exercises/2-foundations-of-rust/3-advanced-syntax/3-slices/src/main.rs index a4d5324..578e19b 100644 --- a/exercises/2-foundations-of-rust/3-advanced-syntax/3-slices/src/main.rs +++ b/exercises/2-foundations-of-rust/3-advanced-syntax/3-slices/src/main.rs @@ -73,10 +73,13 @@ mod test { #[test] fn test_sort() { - assert_eq!(merge_sort(&[]), vec![]); - assert_eq!(merge_sort(&[5]), vec![5]); - assert_eq!(merge_sort(&[1,2,3]), vec![1,2,3]); - assert_eq!(merge_sort(&[47,42,5,1]), vec![1,5,42,47]); - assert_eq!(merge_sort(&[6,47,42,5,1,123]), vec![1,5,6,42,47,123]); + assert_eq!(merge_sort(&[]), vec![]); + assert_eq!(merge_sort(&[5]), vec![5]); + assert_eq!(merge_sort(&[1, 2, 3]), vec![1, 2, 3]); + assert_eq!(merge_sort(&[47, 42, 5, 1]), vec![1, 5, 42, 47]); + assert_eq!( + merge_sort(&[6, 47, 42, 5, 1, 123]), + vec![1, 5, 6, 42, 47, 123] + ); } }