Skip to content

Commit 30273a6

Browse files
authored
Merge branch 'main' into main
2 parents eb952a4 + 9691c3c commit 30273a6

File tree

13 files changed

+473
-309
lines changed

13 files changed

+473
-309
lines changed

.all-contributorsrc

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2685,6 +2685,42 @@
26852685
"contributions": [
26862686
"code"
26872687
]
2688+
},
2689+
{
2690+
"login": "paul-leydier",
2691+
"name": "Paul Leydier",
2692+
"avatar_url": "https://avatars.githubusercontent.com/u/75126792?v=4",
2693+
"profile": "https://github.com/paul-leydier",
2694+
"contributions": [
2695+
"doc"
2696+
]
2697+
},
2698+
{
2699+
"login": "wznmickey",
2700+
"name": "wznmickey",
2701+
"avatar_url": "https://avatars.githubusercontent.com/u/44784663?v=4",
2702+
"profile": "http://wznmickey.com",
2703+
"contributions": [
2704+
"doc"
2705+
]
2706+
},
2707+
{
2708+
"login": "NicolasRoelandt",
2709+
"name": "NicolasRoelandt",
2710+
"avatar_url": "https://avatars.githubusercontent.com/u/8594193?v=4",
2711+
"profile": "https://github.com/NicolasRoelandt",
2712+
"contributions": [
2713+
"doc"
2714+
]
2715+
},
2716+
{
2717+
"login": "jbouganim-parallel",
2718+
"name": "Josh Bouganim",
2719+
"avatar_url": "https://avatars.githubusercontent.com/u/150748285?v=4",
2720+
"profile": "https://github.com/jbouganim-parallel",
2721+
"contributions": [
2722+
"code"
2723+
]
26882724
}
26892725
],
26902726
"contributorsPerLine": 8,

AUTHORS.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,12 @@ authors.
378378
<td align="center" valign="top" width="12.5%"><a href="https://github.com/0Ahmed-0"><img src="https://avatars.githubusercontent.com/u/111569638?v=4?s=100" width="100px;" alt="0Ahmed-0"/><br /><sub><b>0Ahmed-0</b></sub></a><br /><a href="#content-0Ahmed-0" title="Content">🖋</a></td>
379379
<td align="center" valign="top" width="12.5%"><a href="https://github.com/guizo792"><img src="https://avatars.githubusercontent.com/u/95940388?v=4?s=100" width="100px;" alt="guizo792"/><br /><sub><b>guizo792</b></sub></a><br /><a href="#content-guizo792" title="Content">🖋</a></td>
380380
<td align="center" valign="top" width="12.5%"><a href="https://github.com/kazu728"><img src="https://avatars.githubusercontent.com/u/34614358?v=4?s=100" width="100px;" alt="Kazuki Matsuo"/><br /><sub><b>Kazuki Matsuo</b></sub></a><br /><a href="https://github.com/rust-lang/rustlings/commits?author=kazu728" title="Code">💻</a></td>
381+
<td align="center" valign="top" width="12.5%"><a href="https://github.com/paul-leydier"><img src="https://avatars.githubusercontent.com/u/75126792?v=4?s=100" width="100px;" alt="Paul Leydier"/><br /><sub><b>Paul Leydier</b></sub></a><br /><a href="https://github.com/rust-lang/rustlings/commits?author=paul-leydier" title="Documentation">📖</a></td>
382+
</tr>
383+
<tr>
384+
<td align="center" valign="top" width="12.5%"><a href="http://wznmickey.com"><img src="https://avatars.githubusercontent.com/u/44784663?v=4?s=100" width="100px;" alt="wznmickey"/><br /><sub><b>wznmickey</b></sub></a><br /><a href="https://github.com/rust-lang/rustlings/commits?author=wznmickey" title="Documentation">📖</a></td>
385+
<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>
386+
<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>
381387
</tr>
382388
</tbody>
383389
</table>

CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ _implement a new feature! ➡️ [open an Issue to discuss it first, then a Pull
2121

2222
`rustlings` is basically a glorified `rustc` wrapper. Therefore the source code
2323
isn't really that complicated since the bulk of the work is done by `rustc`.
24-
`src/main.rs` contains a simple `argh` CLI that connects to most of the other source files.
2524

2625
<a name="addex"></a>
2726
### Adding an exercise
@@ -66,7 +65,7 @@ changes. There's a couple of things to watch out for:
6665

6766
#### Write correct commit messages
6867

69-
We follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0-beta.4/)
68+
We follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
7069
specification.
7170
This means that you have to format your commit messages in a specific way. Say
7271
you're working on adding a new exercise called `foobar1.rs`. You could write

0 commit comments

Comments
 (0)