Skip to content

Update toolchain to latest nightly (Nov 13)#460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dvdplm wants to merge 22 commits into from
Closed

Update toolchain to latest nightly (Nov 13) #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
7d65239
Update to `nightly-2025-07-07`.
nnethercote Sep 30, 2025
e3a060c
Update to `nightly-2025-07-14`.
nnethercote Sep 30, 2025
0e38181
Update to `nightly-2025-07-28`.
nnethercote Oct 1, 2025
9727d5e
Update to `nightly-2025-08-04`.
nnethercote Oct 2, 2025
42dc34a
Update target specs to new format
dvdplm Nov 5, 2025
86f76be
Update toolchain to Nov 02
dvdplm Nov 5, 2025
75dfd3f
Updated arguments and return types
dvdplm Nov 5, 2025
7a474a7
Updated arguments and return types
dvdplm Nov 5, 2025
9e31431
Comment out ICEing handling of `From` impls
dvdplm Nov 5, 2025
83f37b0
Updated build script
dvdplm Nov 5, 2025
27398fd
More new trait methods, changes return types and error variants
dvdplm Nov 5, 2025
716e6de
Merge branch 'main' into update-toolchain-Nov-02-2025
dvdplm Nov 6, 2025
a130cfe
Revert "Update target specs to new format"
dvdplm Nov 6, 2025
280f4fd
Update target specs to new format
dvdplm Nov 6, 2025
5324957
Revert "Merge branch 'main' into update-toolchain-Nov-02-2025"
dvdplm Nov 6, 2025
3301291
Fix test
dvdplm Nov 6, 2025
c0c12b8
Undo noise
dvdplm Nov 6, 2025
fcf9dbf
More tweaks to accomodate recent rustc changes
dvdplm Nov 10, 2025
58ce9d7
Update to nightly-2025-11-13
dvdplm Nov 14, 2025
ce58f62
Match build.rs to toolchain, handle macOS non-utf8 metadata files
dvdplm Nov 14, 2025
c11e5d0
Match latest attributes to `rustc_codegen_ssa`
dvdplm Nov 14, 2025
6021236
The `env` of `rustc_session::Session`'s target options is an enum now…
dvdplm Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-opengl4.0.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-opengl4.1.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-opengl4.2.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-opengl4.3.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-opengl4.5.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.0.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.1.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.2.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.3.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.4.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.5.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.6.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.0.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.1.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.1spv1.4.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.2.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.3.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
2 changes: 1 addition & 1 deletion crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.4.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,5 +22,5 @@
},
"panic-strategy": "abort",
"simd-types-indirect": false,
"target-pointer-width": "32"
"target-pointer-width": 32
}
1 change: 1 addition & 0 deletions crates/rustc_codegen_spirv/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,7 @@ rustc_codegen_spirv-target-specs.workspace = true

[dev-dependencies]
pretty_assertions = "1.0"
termcolor = "1.1.3"

# HACK(eddyb) can't re-introduce deps of `rustc_codegen_ssa`, for `pqp_cg_ssa`
# (see `build.rs`).
Expand Down
18 changes: 14 additions & 4 deletions crates/rustc_codegen_spirv/build.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ use std::collections::VecDeque;
use std::error::Error;
use std::path::{Path, PathBuf};
use std::process::{Command, ExitCode};
use std::string::ToString;
use std::{env, fs, mem};

/// Current `rust-toolchain.toml` file
Expand All@@ -19,9 +18,9 @@ use std::{env, fs, mem};
/// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/
//const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain.toml");
const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
channel = "nightly-2025-06-30"
channel = "nightly-2025-11-11"
components = ["rust-src", "rustc-dev", "llvm-tools"]
# commit_hash = 35f6036521777bdc0dcea1f980be4c192962a168"#;
# commit_hash = 2286e5d224b3413484cf4f398a9f078487e7b49d"#;

fn rustc_output(arg: &str) -> Result<String, Box<dyn Error>> {
let rustc = env::var("RUSTC").unwrap_or_else(|_| "rustc".into());
Expand DownExpand Up@@ -73,7 +72,7 @@ fn check_toolchain_version() -> Result<(), Box<dyn Error>> {
let stripped_toolchain = REQUIRED_RUST_TOOLCHAIN
.lines()
.filter(|l| !l.trim().is_empty() && !l.starts_with("# "))
.map(ToString::to_string)
.map(|l| l.to_string())
.reduce(|a, b| a + "\n" + &b)
.unwrap_or_default();

Expand DownExpand Up@@ -135,6 +134,10 @@ fn generate_pqp_cg_ssa() -> Result<(), Box<dyn Error>> {
}

let in_path = entry.path();

if in_path.ends_with(".DS_Store") {
continue;
}
let out_path = out_dir.join(entry.file_name());

let mut src = fs::read_to_string(in_path)?;
Expand DownExpand Up@@ -198,6 +201,13 @@ mod win {",
for link_path in raw_dylib::",
);
}
src = src.replace(
"
for (link_path, as_needed) in raw_dylib::",
"
#[cfg(any())]
for (link_path, as_needed) in raw_dylib::",
);
if relative_path == Path::new("src/back/metadata.rs") {
// HACK(eddyb) remove `object` dependency.
src = src.replace(
Expand Down
6 changes: 3 additions & 3 deletions crates/rustc_codegen_spirv/src/abi.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -286,7 +286,7 @@ impl<'tcx> ConvSpirvType<'tcx> for TyAndLayout<'tcx> {
span = cx.tcx.def_span(adt.did());
}

let attrs = AggregatedSpirvAttributes::parse(cx, cx.tcx.get_attrs_unchecked(adt.did()));
let attrs = AggregatedSpirvAttributes::parse(cx, cx.tcx.get_all_attrs(adt.did()));

if let Some(intrinsic_type_attr) = attrs.intrinsic_type.map(|attr| attr.value)
&& let Ok(spirv_type) =
Expand DownExpand Up@@ -791,7 +791,7 @@ fn trans_intrinsic_type<'tcx>(
let sampled_type = match args.type_at(0).kind() {
TyKind::Int(int) => match int {
IntTy::Isize => {
SpirvType::Integer(cx.tcx.data_layout.pointer_size.bits() as u32, true)
SpirvType::Integer(cx.tcx.data_layout.pointer_size().bits() as u32, true)
.def(span, cx)
}
IntTy::I8 => SpirvType::Integer(8, true).def(span, cx),
Expand All@@ -802,7 +802,7 @@ fn trans_intrinsic_type<'tcx>(
},
TyKind::Uint(uint) => match uint {
UintTy::Usize => {
SpirvType::Integer(cx.tcx.data_layout.pointer_size.bits() as u32, false)
SpirvType::Integer(cx.tcx.data_layout.pointer_size().bits() as u32, false)
.def(span, cx)
}
UintTy::U8 => SpirvType::Integer(8, false).def(span, cx),
Expand Down
3 changes: 0 additions & 3 deletions crates/rustc_codegen_spirv/src/attr.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,7 +75,6 @@ pub enum IntrinsicType {
pub struct SpecConstant {
pub id: u32,
pub default: Option<u32>,
pub array_count: Option<u32>,
}

// NOTE(eddyb) when adding new `#[spirv(...)]` attributes, the tests found inside
Expand DownExpand Up@@ -662,8 +661,6 @@ fn parse_spec_constant_attr(
Ok(SpecConstant {
id: id.ok_or_else(|| (arg.span(), "expected `spec_constant(id = ...)`".into()))?,
default,
// to be set later
array_count: None,
})
}

Expand Down
Loading
Loading