mirror of
https://github.com/notohh/rustlings.git
synced 2024-11-29 08:44:16 -05:00
Merge branch 'main' into all-contributors/add-offbyone
This commit is contained in:
commit
5c405ea0f5
4 changed files with 11 additions and 2 deletions
|
@ -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,
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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'"
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue