Skip to content

Commit 7123c7a

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fix-enum-variant-inconsistency
2 parents 77b687d + 4d9c346 commit 7123c7a

File tree

269 files changed

+9708
-7808
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

269 files changed

+9708
-7808
lines changed

.all-contributorsrc

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

.devcontainer/devcontainer.json

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

.devcontainer/setup.sh

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

.github/workflows/rust.yml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,42 @@ name: Rustlings Tests
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [main]
66
pull_request:
7-
branches: [ main ]
7+
branches: [main]
88

99
env:
1010
CARGO_TERM_COLOR: always
1111

1212
jobs:
13+
clippy:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v4
17+
- run: cargo clippy -- --deny warnings
1318
fmt:
1419
runs-on: ubuntu-latest
1520
steps:
16-
- uses: actions/checkout@v3
17-
- uses: dtolnay/rust-toolchain@stable
18-
with:
19-
components: rustfmt
20-
- uses: DavidAnson/markdownlint-cli2-action@v9
21+
- uses: actions/checkout@v4
22+
- uses: DavidAnson/markdownlint-cli2-action@v16
2123
with:
2224
globs: "exercises/**/*.md"
2325
- name: Run cargo fmt
24-
run: |
25-
cargo fmt --all -- --check
26+
run: cargo fmt --all -- --check
2627
test:
2728
runs-on: ${{ matrix.os }}
2829
strategy:
2930
matrix:
3031
os: [ubuntu-latest, windows-latest, macOS-latest]
3132
steps:
32-
- uses: actions/checkout@v3
33-
- uses: dtolnay/rust-toolchain@stable
33+
- uses: actions/checkout@v4
3434
- uses: swatinem/rust-cache@v2
3535
- name: Run cargo test
36-
run: |
37-
cargo test
36+
run: cargo test
37+
dev-check:
38+
runs-on: ubuntu-latest
39+
steps:
40+
- uses: actions/checkout@v4
41+
- uses: swatinem/rust-cache@v2
42+
- name: Run rustlings dev check
43+
run: cargo run -- dev check --require-solutions

.github/workflows/web.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,9 @@ jobs:
5454
runs-on: ubuntu-latest
5555
steps:
5656
# Setup
57-
- uses: actions/checkout@v3
57+
- uses: actions/checkout@v4
5858
with:
5959
fetch-depth: 0
60-
- uses: dtolnay/rust-toolchain@stable
6160
- uses: swatinem/rust-cache@v2
6261

6362
# If you use any mdbook plugins, here's the place to install them!

.gitignore

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
1-
*.swp
1+
# Cargo
22
target/
3-
**/*.rs.bk
3+
Cargo.lock
4+
!/Cargo.lock
5+
6+
# State file
7+
.rustlings-state.txt
8+
9+
# oranda
10+
public/
11+
.netlify
12+
13+
# OS
414
.DS_Store
5-
*.pdb
6-
exercises/clippy/Cargo.toml
7-
exercises/clippy/Cargo.lock
8-
rust-project.json
15+
.direnv/
16+
17+
# Editor
18+
*.swp
919
.idea
10-
.vscode/*
11-
!.vscode/extensions.json
1220
*.iml
13-
*.o
14-
public/
15-
.direnv/
1621

17-
# Local Netlify folder
18-
.netlify
22+
# Ignore file for editors like Helix
23+
.ignore

.gitpod.yml

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

.typos.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[files]
2+
extend-exclude = [
3+
"CHANGELOG.md",
4+
]
5+
6+
[default.extend-words]
7+
"ratatui" = "ratatui"

.vscode/extensions.json

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

AUTHORS.md

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

0 commit comments

Comments
 (0)