tristan/rustlings
1
0
Fork 0
mirror of https://github.com/rust-lang/rustlings.git synced 2024-12-29 00:36:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'main' into all-contributors/add-offbyone

Browse source
This commit is contained in:
liv 2023-09-26 11:01:28 +02:00 committed by GitHub
commit 5c405ea0f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.all-contributorsrc
View file

@ -2442,6 +2442,14 @@
"contributions": [ "contributions": [
"infra" "infra"
] ]
},
"login": "dieterplex",
"name": "d1t2",
"avatar_url": "https://avatars.githubusercontent.com/u/507502?v=4",
"profile": "https://github.com/dieterplex",
"contributions": [
"infra"
]
} }
], ],
"contributorsPerLine": 8, "contributorsPerLine": 8,

1
AUTHORS.md
View file

@ -345,6 +345,7 @@ authors.
<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> <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>
<td align="center" valign="top" width="12.5%"><a href="https://github.com/OfirLauber"><img src="https://avatars.githubusercontent.com/u/5631030?v=4?s=100" width="100px;" alt="Ofir Lauber"/><br /><sub><b>Ofir Lauber</b></sub></a><br /><a href="#content-OfirLauber" title="Content">🖋</a></td> <td align="center" valign="top" width="12.5%"><a href="https://github.com/OfirLauber"><img src="https://avatars.githubusercontent.com/u/5631030?v=4?s=100" width="100px;" alt="Ofir Lauber"/><br /><sub><b>Ofir Lauber</b></sub></a><br /><a href="#content-OfirLauber" title="Content">🖋</a></td>
<td align="center" valign="top" width="12.5%"><a href="https://github.com/offbyone"><img src="https://avatars.githubusercontent.com/u/181693?v=4?s=100" width="100px;" alt="Chris Rose"/><br /><sub><b>Chris Rose</b></sub></a><br /><a href="#infra-offbyone" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td> <td align="center" valign="top" width="12.5%"><a href="https://github.com/offbyone"><img src="https://avatars.githubusercontent.com/u/181693?v=4?s=100" width="100px;" alt="Chris Rose"/><br /><sub><b>Chris Rose</b></sub></a><br /><a href="#infra-offbyone" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
<td align="center" valign="top" width="12.5%"><a href="https://github.com/dieterplex"><img src="https://avatars.githubusercontent.com/u/507502?v=4?s=100" width="100px;" alt="d1t2"/><br /><sub><b>d1t2</b></sub></a><br /><a href="#infra-dieterplex" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

2
install.ps1
View file

@ -53,7 +53,7 @@ function vercomp($v1, $v2) {
} }
$rustVersion = $(rustc --version).Split(" ")[1] $rustVersion = $(rustc --version).Split(" ")[1]
$minRustVersion = "1.56" $minRustVersion = "1.70"
if ((vercomp $rustVersion $minRustVersion) -eq 2) { if ((vercomp $rustVersion $minRustVersion) -eq 2) {
Write-Host "WARNING: Rust version is too old: $rustVersion - needs at least $minRustVersion" Write-Host "WARNING: Rust version is too old: $rustVersion - needs at least $minRustVersion"
Write-Host "Please update Rust with 'rustup update'" Write-Host "Please update Rust with 'rustup update'"

2
install.sh
View file

@ -124,7 +124,7 @@ function vercomp() {
} }
RustVersion=$(rustc --version | cut -d " " -f 2) RustVersion=$(rustc --version | cut -d " " -f 2)
MinRustVersion=1.58 MinRustVersion=1.70
vercomp "$RustVersion" $MinRustVersion || ec=$? vercomp "$RustVersion" $MinRustVersion || ec=$?
if [ ${ec:-0} -eq 2 ] if [ ${ec:-0} -eq 2 ]
then then