Merge remote-tracking branch 'upstream/main'

sdoyle88 · Apr 9, 2024 · 6a72d6a · 6a72d6a
2 parents 002b7d2 + 258ff6f
commit 6a72d6a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -2730,6 +2730,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "Selflocking",
+      "name": "YunShu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/53544726?v=4",
+      "profile": "https://yunshu.site",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 8,

diff --git a/AUTHORS.md b/AUTHORS.md
@@ -385,6 +385,7 @@ authors.
       <td align="center" valign="top" width="12.5%"><a href="https://github.com/NicolasRoelandt"><img src="https://avatars.githubusercontent.com/u/8594193?v=4?s=100" width="100px;" alt="NicolasRoelandt"/><br /><sub><b>NicolasRoelandt</b></sub></a><br /><a href="https://github.com/rust-lang/rustlings/commits?author=NicolasRoelandt" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="12.5%"><a href="https://github.com/jbouganim-parallel"><img src="https://avatars.githubusercontent.com/u/150748285?v=4?s=100" width="100px;" alt="Josh Bouganim"/><br /><sub><b>Josh Bouganim</b></sub></a><br /><a href="https://github.com/rust-lang/rustlings/commits?author=jbouganim-parallel" title="Code">💻</a></td>
       <td align="center" valign="top" width="12.5%"><a href="https://loshz.com"><img src="https://avatars.githubusercontent.com/u/3449337?v=4?s=100" width="100px;" alt="Dan"/><br /><sub><b>Dan</b></sub></a><br /><a href="https://github.com/rust-lang/rustlings/commits?author=loshz" title="Code">💻</a></td>
+      <td align="center" valign="top" width="12.5%"><a href="https://yunshu.site"><img src="https://avatars.githubusercontent.com/u/53544726?v=4?s=100" width="100px;" alt="YunShu"/><br /><sub><b>YunShu</b></sub></a><br /><a href="#content-Selflocking" title="Content">🖋</a></td>
     </tr>
   </tbody>
 </table>

diff --git a/exercises/20_threads/README.md b/exercises/20_threads/README.md
@@ -7,3 +7,4 @@ Within your program, you can also have independent parts that run simultaneously
 
 - [Dining Philosophers example](https://doc.rust-lang.org/1.4.0/book/dining-philosophers.html)
 - [Using Threads to Run Code Simultaneously](https://doc.rust-lang.org/book/ch16-01-threads.html)
+- [Using Message Passing to Transfer Data Between Threads](https://doc.rust-lang.org/book/ch16-02-message-passing.html)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@ Within your program, you can also have independent parts that run simultaneously

		- [Dining Philosophers example](https://doc.rust-lang.org/1.4.0/book/dining-philosophers.html)
		- [Using Threads to Run Code Simultaneously](https://doc.rust-lang.org/book/ch16-01-threads.html)
		- [Using Message Passing to Transfer Data Between Threads](https://doc.rust-lang.org/book/ch16-02-message-passing.html)