Skip to content

Commit dd72429

Browse files
wznmickeywznmickey
committed
Merge remote-tracking branch 'origin/main'
2 parents 92183a7 + 34d0413 commit dd72429

File tree

26 files changed

+755
-503
lines changed

26 files changed

+755
-503
lines changed

‎.all-contributorsrc‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2559,6 +2559,132 @@
25592559
"contributions": [
25602560
"content"
25612561
]
2562+
},
2563+
{
2564+
"login": "AnonimAnonim2245",
2565+
"name": "Luca Plian",
2566+
"avatar_url": "https://avatars.githubusercontent.com/u/98339220?v=4",
2567+
"profile": "https://github.com/AnonimAnonim2245",
2568+
"contributions": [
2569+
"code"
2570+
]
2571+
},
2572+
{
2573+
"login": "reifenrath-dev",
2574+
"name": "René Reifenrath",
2575+
"avatar_url": "https://avatars.githubusercontent.com/u/18126097?v=4",
2576+
"profile": "https://reifenrath.dev/",
2577+
"contributions": [
2578+
"content"
2579+
]
2580+
},
2581+
{
2582+
"login": "peterneave",
2583+
"name": "Peter Neave",
2584+
"avatar_url": "https://avatars.githubusercontent.com/u/7982708?v=4",
2585+
"profile": "https://github.com/peterneave",
2586+
"contributions": [
2587+
"infra"
2588+
]
2589+
},
2590+
{
2591+
"login": "JanB1",
2592+
"name": "Jan",
2593+
"avatar_url": "https://avatars.githubusercontent.com/u/5552248?v=4",
2594+
"profile": "http://www.janb1.com",
2595+
"contributions": [
2596+
"content"
2597+
]
2598+
},
2599+
{
2600+
"login": "kylev",
2601+
"name": "Kyle VanderBeek",
2602+
"avatar_url": "https://avatars.githubusercontent.com/u/46888?v=4",
2603+
"profile": "http://www.kylev.com/",
2604+
"contributions": [
2605+
"infra"
2606+
]
2607+
},
2608+
{
2609+
"login": "pavedroad",
2610+
"name": "pavedroad",
2611+
"avatar_url": "https://avatars.githubusercontent.com/u/138004431?v=4",
2612+
"profile": "https://github.com/pavedroad",
2613+
"contributions": [
2614+
"content"
2615+
]
2616+
},
2617+
{
2618+
"login": "hyphena",
2619+
"name": "luna",
2620+
"avatar_url": "https://avatars.githubusercontent.com/u/26529488?v=4",
2621+
"profile": "https://github.com/hyphena",
2622+
"contributions": [
2623+
"content"
2624+
]
2625+
},
2626+
{
2627+
"login": "evanmiller2112",
2628+
"name": "Evan Miller",
2629+
"avatar_url": "https://avatars.githubusercontent.com/u/28488957?v=4",
2630+
"profile": "https://github.com/evanmiller2112",
2631+
"contributions": [
2632+
"content"
2633+
]
2634+
},
2635+
{
2636+
"login": "luvchurchill",
2637+
"name": "luvchurchill",
2638+
"avatar_url": "https://avatars.githubusercontent.com/u/46406654?v=4",
2639+
"profile": "https://github.com/luvchurchill",
2640+
"contributions": [
2641+
"code"
2642+
]
2643+
},
2644+
{
2645+
"login": "LeverImmy",
2646+
"name": "Ze-en Xiong",
2647+
"avatar_url": "https://avatars.githubusercontent.com/u/47663913?v=4",
2648+
"profile": "https://leverimmy.top/",
2649+
"contributions": [
2650+
"content"
2651+
]
2652+
},
2653+
{
2654+
"login": "parnavh",
2655+
"name": "Parnav Harinathan",
2656+
"avatar_url": "https://avatars.githubusercontent.com/u/45985534?v=4",
2657+
"profile": "https://github.com/parnavh",
2658+
"contributions": [
2659+
"content"
2660+
]
2661+
},
2662+
{
2663+
"login": "0Ahmed-0",
2664+
"name": "0Ahmed-0",
2665+
"avatar_url": "https://avatars.githubusercontent.com/u/111569638?v=4",
2666+
"profile": "https://github.com/0Ahmed-0",
2667+
"contributions": [
2668+
"content"
2669+
]
2670+
},
2671+
{
2672+
"login": "guizo792",
2673+
"name": "guizo792",
2674+
"avatar_url": "https://avatars.githubusercontent.com/u/95940388?v=4",
2675+
"profile": "https://github.com/guizo792",
2676+
"contributions": [
2677+
"content"
2678+
]
2679+
},
2680+
{
2681+
"login": "kazu728",
2682+
"name": "Kazuki Matsuo",
2683+
"avatar_url": "https://avatars.githubusercontent.com/u/34614358?v=4",
2684+
"profile": "https://github.com/kazu728",
2685+
"contributions": [
2686+
"code"
2687+
]
25622688
}
25632689
],
25642690
"contributorsPerLine": 8,

‎.devcontainer/devcontainer.json‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
11
{
2-
"image": "mcr.microsoft.com/devcontainers/universal:2-linux",
3-
"waitFor": "onCreateCommand",
4-
"onCreateCommand": ".devcontainer/setup.sh",
5-
"updateContentCommand": "cargo build",
6-
"postCreateCommand": "",
7-
"postAttachCommand": {
8-
"server": "rustlings watch"
9-
},
10-
"customizations": {
11-
"vscode": {
12-
"extensions": [
13-
"rust-lang.rust-analyzer"
14-
]
15-
}
2+
"image": "mcr.microsoft.com/devcontainers/rust:1",
3+
"updateContentCommand": ["cargo", "build"],
4+
"postAttachCommand": ["rustlings", "watch"],
5+
"remoteEnv": {
6+
"PATH": "${containerEnv:PATH}:${containerWorkspaceFolder}/target/debug"
167
}
178
}

‎.devcontainer/setup.sh‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
* text=auto
2+
*.sh text eol=lf

‎AUTHORS.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,22 @@ authors.
362362
</tr>
363363
<tr>
364364
<td align="center" valign="top" width="12.5%"><a href="https://github.com/gerases"><img src="https://avatars.githubusercontent.com/u/8953623?v=4?s=100" width="100px;" alt="gerases"/><br /><sub><b>gerases</b></sub></a><br /><a href="#content-gerases" title="Content">🖋</a></td>
365+
<td align="center" valign="top" width="12.5%"><a href="https://github.com/AnonimAnonim2245"><img src="https://avatars.githubusercontent.com/u/98339220?v=4?s=100" width="100px;" alt="Luca Plian"/><br /><sub><b>Luca Plian</b></sub></a><br /><a href="https://github.com/rust-lang/rustlings/commits?author=AnonimAnonim2245" title="Code">💻</a></td>
366+
<td align="center" valign="top" width="12.5%"><a href="https://reifenrath.dev/"><img src="https://avatars.githubusercontent.com/u/18126097?v=4?s=100" width="100px;" alt="René Reifenrath"/><br /><sub><b>René Reifenrath</b></sub></a><br /><a href="#content-reifenrath-dev" title="Content">🖋</a></td>
367+
<td align="center" valign="top" width="12.5%"><a href="https://github.com/peterneave"><img src="https://avatars.githubusercontent.com/u/7982708?v=4?s=100" width="100px;" alt="Peter Neave"/><br /><sub><b>Peter Neave</b></sub></a><br /><a href="#infra-peterneave" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
368+
<td align="center" valign="top" width="12.5%"><a href="http://www.janb1.com"><img src="https://avatars.githubusercontent.com/u/5552248?v=4?s=100" width="100px;" alt="Jan"/><br /><sub><b>Jan</b></sub></a><br /><a href="#content-JanB1" title="Content">🖋</a></td>
369+
<td align="center" valign="top" width="12.5%"><a href="http://www.kylev.com/"><img src="https://avatars.githubusercontent.com/u/46888?v=4?s=100" width="100px;" alt="Kyle VanderBeek"/><br /><sub><b>Kyle VanderBeek</b></sub></a><br /><a href="#infra-kylev" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
370+
<td align="center" valign="top" width="12.5%"><a href="https://github.com/pavedroad"><img src="https://avatars.githubusercontent.com/u/138004431?v=4?s=100" width="100px;" alt="pavedroad"/><br /><sub><b>pavedroad</b></sub></a><br /><a href="#content-pavedroad" title="Content">🖋</a></td>
371+
<td align="center" valign="top" width="12.5%"><a href="https://github.com/hyphena"><img src="https://avatars.githubusercontent.com/u/26529488?v=4?s=100" width="100px;" alt="luna"/><br /><sub><b>luna</b></sub></a><br /><a href="#content-hyphena" title="Content">🖋</a></td>
372+
</tr>
373+
<tr>
374+
<td align="center" valign="top" width="12.5%"><a href="https://github.com/evanmiller2112"><img src="https://avatars.githubusercontent.com/u/28488957?v=4?s=100" width="100px;" alt="Evan Miller"/><br /><sub><b>Evan Miller</b></sub></a><br /><a href="#content-evanmiller2112" title="Content">🖋</a></td>
375+
<td align="center" valign="top" width="12.5%"><a href="https://github.com/luvchurchill"><img src="https://avatars.githubusercontent.com/u/46406654?v=4?s=100" width="100px;" alt="luvchurchill"/><br /><sub><b>luvchurchill</b></sub></a><br /><a href="https://github.com/rust-lang/rustlings/commits?author=luvchurchill" title="Code">💻</a></td>
376+
<td align="center" valign="top" width="12.5%"><a href="https://leverimmy.top/"><img src="https://avatars.githubusercontent.com/u/47663913?v=4?s=100" width="100px;" alt="Ze-en Xiong"/><br /><sub><b>Ze-en Xiong</b></sub></a><br /><a href="#content-LeverImmy" title="Content">🖋</a></td>
377+
<td align="center" valign="top" width="12.5%"><a href="https://github.com/parnavh"><img src="https://avatars.githubusercontent.com/u/45985534?v=4?s=100" width="100px;" alt="Parnav Harinathan"/><br /><sub><b>Parnav Harinathan</b></sub></a><br /><a href="#content-parnavh" title="Content">🖋</a></td>
378+
<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>
379+
<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>
380+
<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>
365381
</tr>
366382
</tbody>
367383
</table>

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
- **structs3**: Clarifed the hint
168168
- **quiz2, as_ref_mut, options1, traits1, traits2**: Clarified hints
169169
- **traits1, traits2, cli**: Tidied up unmatching backticks
170-
- **enums2**: Removed unneccessary indirection of self
170+
- **enums2**: Removed unnecessary indirection of self
171171
- **enums3**: Added an extra tuple comment
172172

173173
#### Housekeeping

0 commit comments

Comments
 (0)