Skip to content

Commit df3bc4b

Browse files
authored
Migrate to Rust Edition 2024 (#49)
1 parent 9c480da commit df3bc4b

Some content is hidden

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

48 files changed

+834
-726
lines changed

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
arch: [x86_64, riscv64, aarch64]
12-
rust-toolchain: [nightly, nightly-2024-05-02]
12+
rust-toolchain: [nightly-2024-12-25, nightly]
1313
env:
1414
RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
1515
steps:
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
rust-toolchain: [nightly, nightly-2024-05-02]
33+
rust-toolchain: [nightly-2024-12-25, nightly]
3434
env:
3535
RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
3636
steps:
@@ -52,7 +52,7 @@ jobs:
5252
matrix:
5353
os: [ubuntu-latest]
5454
arch: [x86_64, riscv64, aarch64]
55-
rust-toolchain: [nightly, nightly-2024-05-02]
55+
rust-toolchain: [nightly-2024-12-25, nightly]
5656
env:
5757
RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
5858
steps:

.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
os: [ubuntu-latest]
1616
arch: [x86_64, riscv64, aarch64]
17-
rust-toolchain: [nightly, nightly-2024-05-02]
17+
rust-toolchain: [nightly-2024-12-25, nightly]
1818
steps:
1919
- uses: actions/checkout@v4
2020
- uses: dtolnay/rust-toolchain@stable
@@ -45,5 +45,5 @@ jobs:
4545
export ACCEL=n
4646
fi
4747
export DISK_IMG="${{ github.workspace }}/disk-${{ matrix.arch }}.img"
48-
export VM_CONFIGS="$(pwd)/arceos-vmm/configs/nimbos-${{ matrix.arch }}.toml"
48+
export VM_CONFIGS="$(pwd)/arceos-vmm/configs/vms/nimbos-${{ matrix.arch }}.toml"
4949
make -C arceos-vmm ARCH=${{ matrix.arch }} DISK_IMG=${DISK_IMG} LOG=info BLK=y ACCEL=${ACCEL} VM_CONFIGS=${VM_CONFIGS} run

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@
88
*.dtb
99
actual.out
1010
qemu.log
11-
rusty-tags.vi
11+
rusty-tags.vi
12+
13+
*/.axconfig.*

0 commit comments

Comments
 (0)