Skip to content

Commit f854664

Browse files
authored
Merge pull request #905 from bgurney-rh/latest-1.76
github actions: update recommended Rust to 1.76.0
2 parents d39add3 + 3193f8a commit f854664

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

.github/workflows/cargo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- uses: dtolnay/rust-toolchain@master
3939
with:
4040
components: cargo
41-
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
41+
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
4242
- name: Check out ci repo
4343
run: git clone https://github.com/stratis-storage/ci.git
4444
- name: Run comparisons of version specs with available Fedora packages

.github/workflows/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ jobs:
2424
matrix:
2525
include:
2626
- components: rustfmt
27-
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
27+
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
2828
task: make -f Makefile fmt-ci
2929
- components: clippy
30-
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
30+
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
3131
task: make -f Makefile clippy
3232
- components: cargo
33-
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
33+
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
3434
task: make -f Makefile build
3535
- components: cargo
36-
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
36+
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
3737
task: make -f Makefile docs
3838
- components: cargo
39-
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
39+
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
4040
task: make -f Makefile check-typos
4141
runs-on: ubuntu-20.04
4242
steps:
@@ -60,7 +60,7 @@ jobs:
6060
matrix:
6161
include:
6262
- toolchain: 1.71.1 # LOWEST SUPPORTED RUST TOOLCHAIN
63-
- toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
63+
- toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
6464
runs-on: ubuntu-20.04
6565
steps:
6666
- uses: actions/checkout@v4

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
matrix:
1717
include:
1818
- components: cargo
19-
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
19+
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
2020
task: make -f Makefile audit
2121
# Allowed because a failure may occur after a new Rust stable
2222
# version is released.
@@ -59,7 +59,7 @@ jobs:
5959
- uses: dtolnay/rust-toolchain@master
6060
with:
6161
components: cargo
62-
toolchain: 1.75.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
62+
toolchain: 1.76.0 # CURRENT DEVELOPMENT RUST TOOLCHAIN
6363
- name: Check out ci repo
6464
run: git clone https://github.com/stratis-storage/ci.git
6565
- name: Run comparisons of version specs with available Fedora packages

src/core/dm.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,7 @@ impl DM {
381381
/// Valid flags: `DM_DEFERRED_REMOVE`
382382
pub fn device_remove(&self, id: &DevId<'_>, options: DmOptions) -> DmResult<DeviceInfo> {
383383
debug!("Removing device {}", id);
384-
#[allow(renamed_and_removed_lints)]
385-
#[allow(clippy::blocks_in_if_conditions)]
384+
#[allow(clippy::blocks_in_conditions)]
386385
match retry_with_index(
387386
Fixed::from_millis(DM_REMOVE_MSLEEP_DELAY).take(DM_REMOVE_RETRIES - 1),
388387
|i| {

0 commit comments

Comments
 (0)