Skip to content

Commit dde201a

Browse files
nnethercoteLegNeato
authored andcommitted
Update to nightly-2025-07-07.
- `let_chains` is now a stable feature. - `Pointer::into_parts` has been replaced with `Pointer::prov_and_relative_offset`. - `DynStar` support has been removed (rust-lang/rust#143036).
1 parent e6e046d commit dde201a

File tree

4 files changed

+2
-11
lines changed

4 files changed

+2
-11
lines changed

crates/rustc_codegen_nvvm/src/const_ty.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ impl<'ll, 'tcx> ConstCodegenMethods for CodegenCx<'ll, 'tcx> {
152152
}
153153
}
154154
Scalar::Ptr(ptr, _) => {
155-
let (prov, offset) = ptr.into_parts();
155+
let (prov, offset) = ptr.prov_and_relative_offset();
156156
let (base_addr, base_addr_space) = match self.tcx.global_alloc(prov.alloc_id()) {
157157
GlobalAlloc::Memory(alloc) => {
158158
// For ZSTs directly codegen an aligned pointer.

crates/rustc_codegen_nvvm/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// make our lives a lot easier for llvm ffi with this. And since rustc's core infra
44
// relies on it its almost guaranteed to not be removed/broken
55
#![feature(extern_types)]
6-
#![feature(let_chains)]
76
#![feature(slice_as_array)]
87

98
extern crate rustc_abi;

crates/rustc_codegen_nvvm/src/ty.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -463,14 +463,6 @@ impl<'tcx> LayoutLlvmExt<'tcx> for TyAndLayout<'tcx> {
463463
.layout_of(ptr_ty)
464464
.scalar_pair_element_llvm_type(cx, index, immediate);
465465
}
466-
// `dyn* Trait` has the same ABI as `*mut dyn Trait`
467-
ty::Dynamic(bounds, region, ty::DynStar) => {
468-
let ptr_ty =
469-
Ty::new_mut_ptr(cx.tcx, Ty::new_dynamic(cx.tcx, bounds, *region, ty::Dyn));
470-
return cx
471-
.layout_of(ptr_ty)
472-
.scalar_pair_element_llvm_type(cx, index, immediate);
473-
}
474466
_ => {}
475467
}
476468

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2025-06-30"
2+
channel = "nightly-2025-07-07"
33
components = ["clippy", "llvm-tools-preview", "rust-src", "rustc-dev", "rustfmt", "rust-analyzer"]

0 commit comments

Comments
 (0)