Merge remote-tracking branch 'upstream/main' into main

.all-contributorsrc

@@ -2406,6 +2406,24 @@
       "contributions": [
         "infra"
       ]
+    },
+    {
+      "login": "krmpotic",
+      "name": "Luka Krmpotić",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10350645?v=4",
+      "profile": "https://github.com/krmpotic",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "jurglic",
+      "name": "Jurglic",
+      "avatar_url": "https://avatars.githubusercontent.com/u/112600?v=4",
+      "profile": "https://github.com/jurglic",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 8,

AUTHORS.md

@@ -340,6 +340,10 @@ authors.
       <td align="center" valign="top" width="12.5%"><a href="https://github.com/husjon"><img src="https://avatars.githubusercontent.com/u/554229?v=4?s=100" width="100px;" alt="Jon Erling Hustadnes"/><br /><sub><b>Jon Erling Hustadnes</b></sub></a><br /><a href="#content-husjon" title="Content">🖋</a></td>
       <td align="center" valign="top" width="12.5%"><a href="https://github.com/CobaltCause"><img src="https://avatars.githubusercontent.com/u/7003738?v=4?s=100" width="100px;" alt="Charles Hall"/><br /><sub><b>Charles Hall</b></sub></a><br /><a href="#infra-CobaltCause" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="12.5%"><a href="https://github.com/krmpotic"><img src="https://avatars.githubusercontent.com/u/10350645?v=4?s=100" width="100px;" alt="Luka Krmpotić"/><br /><sub><b>Luka Krmpotić</b></sub></a><br /><a href="#content-krmpotic" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="12.5%"><a href="https://github.com/jurglic"><img src="https://avatars.githubusercontent.com/u/112600?v=4?s=100" width="100px;" alt="Jurglic"/><br /><sub><b>Jurglic</b></sub></a><br /><a href="#content-jurglic" title="Content">🖋</a></td>
+    </tr>
   </tbody>
 </table>
 

exercises/clippy/clippy3.rs

@@ -1,8 +1,7 @@
 // clippy3.rs
 // 
 // Here's a couple more easy Clippy fixes, so you can see its utility.
-//
-// Execute `rustlings hint clippy3` or use the `hint` watch subcommand for a hint.
+// No hints.
 
 #[allow(unused_variables, unused_assignments)]
 fn main() {

exercises/conversions/as_ref_mut.rs

@@ -55,7 +55,7 @@ mod tests {
     }
 
     #[test]
-    fn mult_box() {
+    fn mut_box() {
         let mut num: Box<u32> = Box::new(3);
         num_sq(&mut num);
         assert_eq!(*num, 9);

exercises/enums/enums3.rs

@@ -22,7 +22,7 @@ struct State {
     color: (u8, u8, u8),
     position: Point,
     quit: bool,
-    message: String
+    message: String,
 }
 
 impl State {
@@ -34,7 +34,9 @@ impl State {
         self.quit = true;
     }
 
-    fn echo(&mut self, s: String) { self.message = s }
+    fn echo(&mut self, s: String) {
+        self.message = s
+    }
 
     fn move_position(&mut self, p: Point) {
         self.position = p;

exercises/primitive_types/primitive_types1.rs

@@ -2,9 +2,6 @@
 //
 // Fill in the rest of the line that has code missing! No hints, there's no
 // tricks, just get used to typing these :)
-//
-// Execute `rustlings hint primitive_types1` or use the `hint` watch subcommand
-// for a hint.
 
 fn main() {
     // Booleans (`bool`)

exercises/primitive_types/primitive_types2.rs

@@ -2,9 +2,6 @@
 //
 // Fill in the rest of the line that has code missing! No hints, there's no
 // tricks, just get used to typing these :)
-//
-// Execute `rustlings hint primitive_types2` or use the `hint` watch subcommand
-// for a hint.
 
 fn main() {
     // Characters (`char`)