Skip to content

Commit a7a786a

Browse files
authored
Merge pull request rustsbi#38 from YdrMaster/main
build: 去除不必要的内容
2 parents ad8a78a + a5ecc5e commit a7a786a

File tree

8 files changed

+20
-44
lines changed

8 files changed

+20
-44
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v3
1818

19-
- name: Setup Rust Toolchain
20-
uses: actions-rs/toolchain@v1
21-
with:
22-
profile: minimal
23-
toolchain: nightly
24-
target: riscv64imac-unknown-none-elf
25-
override: true
26-
2719
- name: Cache Dependencies
2820
uses: Swatinem/rust-cache@v2
2921
with:

.github/workflows/workflow.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,12 @@ jobs:
1010
runs-on: ubuntu-20.04
1111
steps:
1212
- uses: actions/checkout@v3
13-
- uses: actions-rs/toolchain@v1
14-
with:
15-
profile: minimal
16-
toolchain: nightly
17-
components: rustfmt, clippy
18-
target: riscv64imac-unknown-none-elf
13+
1914
- name: Check format
20-
uses: actions-rs/cargo@v1
21-
with:
22-
command: fmt
23-
args: --all -- --check
15+
run: cargo fmt --all -- --check
16+
2417
- name: Clippy
25-
uses: actions-rs/cargo@v1
26-
with:
27-
command: clippy
18+
run: cargo clippy
2819

2920
test:
3021
needs: build

.vscode/settings.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,4 @@
77
// For Rust Analyzer plugin users:
88
"rust-analyzer.cargo.target": "riscv64imac-unknown-none-elf",
99
"rust-analyzer.checkOnSave.allTargets": false,
10-
// Other settings
11-
// For clap
12-
"rust-analyzer.procMacro.attributes.enable": true,
1310
}

Cargo.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust-toolchain.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2+
profile = "minimal"
23
channel = "nightly"
3-
components = ["llvm-tools-preview"]
4+
components = ["rust-src", "llvm-tools-preview", "rustfmt", "clippy"]
45
targets = ["riscv64imac-unknown-none-elf"]
5-
profile = "minimal"

rustsbi-qemu/.cargo/config.toml

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

test-kernel/.cargo/config.toml

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

xtask/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,9 @@ impl QemuArgs {
194194
if let Err(e) = status {
195195
if e.kind() == io::ErrorKind::NotFound {
196196
println!("xtask: QEMU command not found. Does your system have QEMU installed and environment variable configured?");
197-
println!("xtask: error: {}", e);
197+
println!("xtask: error: {e}");
198198
} else {
199-
println!("xtask: error: {}", e);
199+
println!("xtask: error: {e}");
200200
}
201201
process::exit(1);
202202
}

0 commit comments

Comments
 (0)