Merge branch 'rust-lang:main' into exercises/quiz2.rs

.all-contributorsrc

@@ -1749,6 +1749,24 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "0xMySt1c",
+      "name": "0xMySt1c",
+      "avatar_url": "https://avatars.githubusercontent.com/u/101825630?v=4",
+      "profile": "https://github.com/0xMySt1c",
+      "contributions": [
+        "tool"
+      ]
+    },
+    {
+      "login": "AxolotlTears",
+      "name": "Ten",
+      "avatar_url": "https://avatars.githubusercontent.com/u/87157047?v=4",
+      "profile": "https://github.com/AxolotlTears",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 8,

.gitpod.yml

@@ -4,4 +4,4 @@ tasks:
 
 vscode:
   extensions:
-    - rust-lang.rust@0.7.8
+    - rust-lang.rust-analyzer@0.3.1348

AUTHORS.md

@@ -248,6 +248,10 @@ authors.
       <td align="center"><a href="https://github.com/seporterfield"><img src="https://avatars.githubusercontent.com/u/107010978?v=4?s=100" width="100px;" alt="seporterfield"/><br /><sub><b>seporterfield</b></sub></a><br /><a href="#content-seporterfield" title="Content">🖋</a></td>
       <td align="center"><a href="https://www.linkedin.com/in/dbarrosop"><img src="https://avatars.githubusercontent.com/u/6246622?v=4?s=100" width="100px;" alt="David Barroso"/><br /><sub><b>David Barroso</b></sub></a><br /><a href="#infra-dbarrosop" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
       <td align="center"><a href="https://distanz.ch"><img src="https://avatars.githubusercontent.com/u/539708?v=4?s=100" width="100px;" alt="Tobias Klauser"/><br /><sub><b>Tobias Klauser</b></sub></a><br /><a href="https://github.com/rust-lang/rustlings/commits?author=tklauser" title="Code">💻</a></td>
+      <td align="center"><a href="https://github.com/0xMySt1c"><img src="https://avatars.githubusercontent.com/u/101825630?v=4?s=100" width="100px;" alt="0xMySt1c"/><br /><sub><b>0xMySt1c</b></sub></a><br /><a href="#tool-0xMySt1c" title="Tools">🔧</a></td>
+    </tr>
+    <tr>
+      <td align="center"><a href="https://github.com/AxolotlTears"><img src="https://avatars.githubusercontent.com/u/87157047?v=4?s=100" width="100px;" alt="Ten"/><br /><sub><b>Ten</b></sub></a><br /><a href="https://github.com/rust-lang/rustlings/commits?author=AxolotlTears" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

info.toml

@@ -1072,7 +1072,7 @@ name = "clippy1"
 path = "exercises/clippy/clippy1.rs"
 mode = "clippy"
 hint = """
-Rust stores the highest precision version of any long or inifinite precision
+Rust stores the highest precision version of any long or infinite precision
 mathematical constants in the Rust standard library.
 https://doc.rust-lang.org/stable/std/f32/consts/index.html
 

src/main.rs

@@ -350,7 +350,7 @@ fn watch(exercises: &[Exercise], verbose: bool) -> notify::Result<WatchStatus> {
     let (tx, rx) = channel();
     let should_quit = Arc::new(AtomicBool::new(false));
 
-    let mut watcher: RecommendedWatcher = Watcher::new(tx, Duration::from_secs(2))?;
+    let mut watcher: RecommendedWatcher = Watcher::new(tx, Duration::from_secs(1))?;
     watcher.watch(Path::new("./exercises"), RecursiveMode::Recursive)?;
 
     clear_screen();