Skip to content

Commit 7d1f5f2

Browse files
chore: update CORE_MSRV to 1.90
1 parent d0c9044 commit 7d1f5f2

8 files changed

Lines changed: 11 additions & 15 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222
REPO_MSRV: "1.92"
2323
# This is the MSRV used by the `wgpu-core`, `wgpu-hal`, and `wgpu-types` crates,
2424
# to ensure that they can be used with firefox.
25-
CORE_MSRV: "1.82.0"
25+
CORE_MSRV: "1.90.0"
2626

2727
#
2828
# Environment variables

naga-cli/src/bin/naga.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#![allow(clippy::manual_strip)]
21
use anyhow::{anyhow, Context as _};
3-
#[allow(unused_imports)]
42
use std::fs;
53
use std::{error::Error, fmt, io::Read, path::Path, str::FromStr};
64

@@ -260,10 +258,10 @@ impl FromStr for GlslProfileArg {
260258

261259
fn from_str(s: &str) -> Result<Self, Self::Err> {
262260
use naga::back::glsl::Version;
263-
Ok(Self(if s.starts_with("core") {
264-
Version::Desktop(s[4..].parse().unwrap_or(330))
265-
} else if s.starts_with("es") {
266-
Version::new_gles(s[2..].parse().unwrap_or(310))
261+
Ok(Self(if let Some(s) = s.strip_prefix("core") {
262+
Version::Desktop(s.parse().unwrap_or(330))
263+
} else if let Some(s) = s.strip_prefix("es") {
264+
Version::new_gles(s.parse().unwrap_or(310))
267265
} else {
268266
return Err(format!("Unknown profile: {s}"));
269267
}))

naga/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ exclude = ["bin/**/*", "tests/**/*", "Cargo.lock", "target/**/*"]
1313
# copy the crates it actually uses out of the workspace, so it's meaningful for
1414
# them to have less restrictive MSRVs individually than the workspace as a
1515
# whole, if their code permits. See `../README.md` for details.
16-
rust-version = "1.82.0"
16+
rust-version = "1.90.0"
1717

1818
[package.metadata.docs.rs]
1919
all-features = true

naga/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[![Crates.io](https://img.shields.io/crates/v/naga.svg?label=naga)](https://crates.io/crates/naga)
55
[![Docs.rs](https://docs.rs/naga/badge.svg)](https://docs.rs/naga)
66
[![Build Status](https://github.com/gfx-rs/naga/workflows/pipeline/badge.svg)](https://github.com/gfx-rs/naga/actions)
7-
![MSRV](https://img.shields.io/badge/rustc-1.82-blue.svg)
7+
![MSRV](https://img.shields.io/badge/rustc-1.90-blue.svg)
88
[![codecov.io](https://codecov.io/gh/gfx-rs/naga/branch/master/graph/badge.svg?token=9VOKYO8BM2)](https://codecov.io/gh/gfx-rs/naga)
99

1010
The shader translation library for the needs of [wgpu](https://github.com/gfx-rs/wgpu).

wgpu-core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ license.workspace = true
1313
# copy the crates it actually uses out of the workspace, so it's meaningful for
1414
# them to have less restrictive MSRVs individually than the workspace as a
1515
# whole, if their code permits. See `../README.md` for details.
16-
rust-version = "1.82.0"
16+
rust-version = "1.90.0"
1717

1818
[package.metadata.docs.rs]
1919
all-features = true

wgpu-hal/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ license.workspace = true
1313
# copy the crates it actually uses out of the workspace, so it's meaningful for
1414
# them to have less restrictive MSRVs individually than the workspace as a
1515
# whole, if their code permits. See `../README.md` for details.
16-
rust-version = "1.82.0"
16+
rust-version = "1.90.0"
1717

1818
[package.metadata.docs.rs]
1919
# Ideally we would enable all the features.

wgpu-hal/src/dx12/device.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,9 +1335,7 @@ impl crate::Device for super::Device {
13351335
let binding = bind_cbv;
13361336
// This is the last time we use this, but lets increment
13371337
// it so if we add more later, the value behaves correctly.
1338-
1339-
// This is an allow as it doesn't trigger on 1.82, hal's MSRV.
1340-
#[allow(unused_assignments)]
1338+
#[expect(unused_assignments)]
13411339
{
13421340
bind_cbv.register += 1;
13431341
}

wgpu-types/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ license.workspace = true
1313
# copy the crates it actually uses out of the workspace, so it's meaningful for
1414
# them to have less restrictive MSRVs individually than the workspace as a
1515
# whole, if their code permits. See `../README.md` for details.
16-
rust-version = "1.82.0"
16+
rust-version = "1.90.0"
1717

1818
[package.metadata.docs.rs]
1919
all-features = true

0 commit comments

Comments
 (0)