From bf33829da240375d086f96267fc2e02fa6b07001 Mon Sep 17 00:00:00 2001
From: Zhenghao Lu <54395432+EmisonLu@users.noreply.github.com>
Date: Mon, 27 Sep 2021 16:03:28 +0800
Subject: [PATCH 01/10] fix(structs3): remove redundant 'return' (#852)
---
exercises/structs/structs3.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/exercises/structs/structs3.rs b/exercises/structs/structs3.rs
index a80d0625..b3aa2825 100644
--- a/exercises/structs/structs3.rs
+++ b/exercises/structs/structs3.rs
@@ -18,11 +18,11 @@ impl Package {
if weight_in_grams <= 0 {
// Something goes here...
} else {
- return Package {
+ Package {
sender_country,
recipient_country,
weight_in_grams,
- };
+ }
}
}
From fed4fe78bbc0f4a9dbace1a556811a9f506237b6 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
<46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 27 Sep 2021 08:03:46 +0000
Subject: [PATCH 02/10] docs: update README.md [skip ci]
---
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 18e0b73a..1c3709cc 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-[](#contributors-)
+[](#contributors-)
# rustlings π¦β€οΈ
@@ -312,6 +312,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
LIU JIE
π |
Antoine BΓΌsch
π» |
frogtd
π |
+ 
Zhenghao Lu
π |
From e3cfaa246dbef9ebea5ca020bdbaf018194b4974 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
<46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 27 Sep 2021 08:03:47 +0000
Subject: [PATCH 03/10] docs: update .all-contributorsrc [skip ci]
---
.all-contributorsrc | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.all-contributorsrc b/.all-contributorsrc
index d18743c2..21089c52 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1002,6 +1002,15 @@
"contributions": [
"content"
]
+ },
+ {
+ "login": "EmisonLu",
+ "name": "Zhenghao Lu",
+ "avatar_url": "https://avatars.githubusercontent.com/u/54395432?v=4",
+ "profile": "https://github.com/EmisonLu",
+ "contributions": [
+ "content"
+ ]
}
],
"contributorsPerLine": 8,
From 46c28d5cef3d8446b5a356b19d8dbc725f91a3a0 Mon Sep 17 00:00:00 2001
From: Fredrik Enestad
Date: Thu, 30 Sep 2021 10:18:36 +0200
Subject: [PATCH 04/10] fix(move_semantics5): correct typo (#857)
---
exercises/move_semantics/move_semantics5.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/exercises/move_semantics/move_semantics5.rs b/exercises/move_semantics/move_semantics5.rs
index 1afe16c5..c4704f9e 100644
--- a/exercises/move_semantics/move_semantics5.rs
+++ b/exercises/move_semantics/move_semantics5.rs
@@ -1,5 +1,5 @@
// move_semantics5.rs
-// Make me compile only be reordering the lines in `main()`, but without
+// Make me compile only by reordering the lines in `main()`, but without
// adding, changing or removing any of them.
// Execute `rustlings hint move_semantics5` for hints :)
From 574bbffe0b11b5426970e4710a2275776690e85e Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
<46447321+allcontributors[bot]@users.noreply.github.com>
Date: Thu, 30 Sep 2021 08:18:52 +0000
Subject: [PATCH 05/10] docs: update README.md [skip ci]
---
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 1c3709cc..6e5ce3f6 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-[](#contributors-)
+[](#contributors-)
# rustlings π¦β€οΈ
@@ -313,6 +313,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Antoine BΓΌsch
π» |
frogtd
π |
Zhenghao Lu
π |
+ 
Fredrik Enestad
π |
From ae54c17b6a5ca63705192011d11d371bb51eee97 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
<46447321+allcontributors[bot]@users.noreply.github.com>
Date: Thu, 30 Sep 2021 08:18:53 +0000
Subject: [PATCH 06/10] docs: update .all-contributorsrc [skip ci]
---
.all-contributorsrc | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.all-contributorsrc b/.all-contributorsrc
index 21089c52..fe18385f 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1011,6 +1011,15 @@
"contributions": [
"content"
]
+ },
+ {
+ "login": "fredr",
+ "name": "Fredrik Enestad",
+ "avatar_url": "https://avatars.githubusercontent.com/u/762956?v=4",
+ "profile": "https://soundtrackyourbrand.com",
+ "contributions": [
+ "content"
+ ]
}
],
"contributorsPerLine": 8,
From 1c0fe3cbcca85f90b3985985b8e265ee872a2ab2 Mon Sep 17 00:00:00 2001
From: rlch
Date: Sat, 2 Oct 2021 23:59:23 +1000
Subject: [PATCH 07/10] fix: few spelling mistakes
---
info.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/info.toml b/info.toml
index 21406630..5eece6d7 100644
--- a/info.toml
+++ b/info.toml
@@ -364,7 +364,7 @@ mode = "compile"
hint = """
The delicious_snacks module is trying to present an external interface that is
different than its internal structure (the `fruits` and `veggies` modules and
-associated constants). Complete the `use` statemants to fit the uses in main and
+associated constants). Complete the `use` statements to fit the uses in main and
find the one keyword missing for both constants."""
[[exercises]]
From 1663a16eade6ca646b6ed061735f7982434d530d Mon Sep 17 00:00:00 2001
From: xuesong
Date: Mon, 18 Oct 2021 19:57:12 +0800
Subject: [PATCH 08/10] fix(traits1): rename test functions to snake case
(#854)
Co-authored-by: zhangshaozhi
---
exercises/advanced_errors/advanced_errs2.rs | 1 -
exercises/traits/traits1.rs | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/exercises/advanced_errors/advanced_errs2.rs b/exercises/advanced_errors/advanced_errs2.rs
index d9d44d06..54e669fd 100644
--- a/exercises/advanced_errors/advanced_errs2.rs
+++ b/exercises/advanced_errors/advanced_errs2.rs
@@ -64,7 +64,6 @@ impl Display for ParseClimateError {
match self {
NoCity => write!(f, "no city name"),
ParseFloat(e) => write!(f, "error parsing temperature: {}", e),
- _ => write!(f, "unhandled error!"),
}
}
}
diff --git a/exercises/traits/traits1.rs b/exercises/traits/traits1.rs
index 2ef9e11b..15e08f24 100644
--- a/exercises/traits/traits1.rs
+++ b/exercises/traits/traits1.rs
@@ -29,12 +29,12 @@ mod tests {
use super::*;
#[test]
- fn is_FooBar() {
+ fn is_foo_bar() {
assert_eq!(String::from("Foo").append_bar(), String::from("FooBar"));
}
#[test]
- fn is_BarBar() {
+ fn is_bar_bar() {
assert_eq!(
String::from("").append_bar().append_bar(),
String::from("BarBar")
From b24b295d88d0f5598c5b0fe0ff926d29ab3c5828 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
<46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 18 Oct 2021 11:57:33 +0000
Subject: [PATCH 09/10] docs: update README.md [skip ci]
---
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 6e5ce3f6..a3ef758d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-[](#contributors-)
+[](#contributors-)
# rustlings π¦β€οΈ
@@ -314,6 +314,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
frogtd
π |
Zhenghao Lu
π |
Fredrik Enestad
π |
+ 
xuesong
π |
From 71da9068e71ee395a30083dfc516e7dc110a2a8f Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
<46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 18 Oct 2021 11:57:34 +0000
Subject: [PATCH 10/10] docs: update .all-contributorsrc [skip ci]
---
.all-contributorsrc | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.all-contributorsrc b/.all-contributorsrc
index fe18385f..d7c7d465 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1020,6 +1020,15 @@
"contributions": [
"content"
]
+ },
+ {
+ "login": "xuesongbj",
+ "name": "xuesong",
+ "avatar_url": "https://avatars.githubusercontent.com/u/18476085?v=4",
+ "profile": "http://xuesong.pydevops.com",
+ "contributions": [
+ "content"
+ ]
}
],
"contributorsPerLine": 8,