Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 52f1522

Browse files
committedDec 1, 2024·
use actions-rust-lang/setup-rust-toolchain to setup rust and cargo
1 parent 09c178c commit 52f1522

File tree

3 files changed

+14
-41
lines changed

3 files changed

+14
-41
lines changed
 

‎.github/workflows/release.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@ jobs:
2323
needs: [release]
2424
steps:
2525
- uses: actions/checkout@v4
26-
- uses: actions-rs/toolchain@v1
27-
with:
28-
toolchain: stable
29-
default: true
30-
- run: cargo build --release -j`nproc`
26+
- uses: actions-rust-lang/setup-rust-toolchain@v1
27+
- run: cargo build --release
3128
- run: |
3229
mv target/release/nomino nomino-linux-64bit
3330
gh release upload "v${{ github.ref_name }}" nomino-linux-64bit --clobber
@@ -41,11 +38,8 @@ jobs:
4138
needs: [release]
4239
steps:
4340
- uses: actions/checkout@v4
44-
- uses: actions-rs/toolchain@v1
45-
with:
46-
toolchain: stable
47-
default: true
48-
- run: cargo build --release -j`sysctl -n hw.physicalcpu`
41+
- uses: actions-rust-lang/setup-rust-toolchain@v1
42+
- run: cargo build --release
4943
- run: |
5044
mv target/release/nomino nomino-macos-64bit
5145
gh release upload "v${{ github.ref_name }}" nomino-macos-64bit --clobber
@@ -59,10 +53,7 @@ jobs:
5953
needs: [release]
6054
steps:
6155
- uses: actions/checkout@v4
62-
- uses: actions-rs/toolchain@v1
63-
with:
64-
toolchain: stable
65-
default: true
56+
- uses: actions-rust-lang/setup-rust-toolchain@v1
6657
- run: cargo build --release
6758
- run: |
6859
mv target/release/nomino.exe nomino-windows-64bit.exe

‎.github/workflows/test.yml

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,21 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4
14-
- uses: actions-rs/toolchain@v1
14+
- uses: actions-rust-lang/setup-rust-toolchain@v1
1515
with:
16-
default: true
17-
toolchain: stable
1816
components: rustfmt, clippy
19-
- uses: actions-rs/cargo@v1
20-
with:
21-
command: test
22-
- uses: actions-rs/cargo@v1
23-
with:
24-
command: fmt
25-
args: -- --check
26-
- uses: actions-rs/cargo@v1
27-
with:
28-
command: clippy
17+
- run: cargo test
18+
- run: cargo fmt -- --check
19+
- run: cargo clippy
2920
macos:
3021
runs-on: macos-latest
3122
steps:
3223
- uses: actions/checkout@v4
33-
- uses: actions-rs/toolchain@v1
34-
with:
35-
default: true
36-
toolchain: stable
37-
- uses: actions-rs/cargo@v1
38-
with:
39-
command: test
24+
- uses: actions-rust-lang/setup-rust-toolchain@v1
25+
- run: cargo test
4026
windows:
4127
runs-on: windows-latest
4228
steps:
4329
- uses: actions/checkout@v4
44-
- uses: actions-rs/toolchain@v1
45-
with:
46-
default: true
47-
toolchain: stable
48-
- uses: actions-rs/cargo@v1
49-
with:
50-
command: test
30+
- uses: actions-rust-lang/setup-rust-toolchain@v1
31+
- run: cargo test

‎src/input/iterator.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use std::vec::IntoIter;
99
use walkdir::IntoIter as WalkIter;
1010
use walkdir::WalkDir;
1111

12+
#[allow(clippy::large_enum_variant)]
1213
pub enum InputIterator {
1314
VectorIterator(IntoIter<(String, String)>),
1415
DirectoryIterator {

0 commit comments

Comments
 (0)
Please sign in to comment.