Skip to content

Commit 4fcac6a

Browse files
committed
rustup: update to nightly-2025-04-14.
1 parent 0517dff commit 4fcac6a

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

crates/rustc_codegen_spirv/build.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ use std::{env, fs, mem};
1818
/// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/
1919
//const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain.toml");
2020
const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
21-
channel = "nightly-2025-04-13"
21+
channel = "nightly-2025-04-14"
2222
components = ["rust-src", "rustc-dev", "llvm-tools"]
23-
# commit_hash = 9ffde4b089fe8e43d5891eb517001df27a8443ff"#;
23+
# commit_hash = 092a284ba0421695f2032c947765429fd7095796"#;
2424

2525
fn rustc_output(arg: &str) -> Result<String, Box<dyn Error>> {
2626
let rustc = env::var("RUSTC").unwrap_or_else(|_| "rustc".into());

rust-toolchain.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[toolchain]
2-
channel = "nightly-2025-04-13"
2+
channel = "nightly-2025-04-14"
33
components = ["rust-src", "rustc-dev", "llvm-tools"]
4-
# commit_hash = 9ffde4b089fe8e43d5891eb517001df27a8443ff
4+
# commit_hash = 092a284ba0421695f2032c947765429fd7095796
55

66
# Whenever changing the nightly channel, update the commit hash above, and make
77
# sure to change `REQUIRED_TOOLCHAIN` in `crates/rustc_codegen_spirv/build.rs` also.

tests/ui/dis/ptr_copy.normal.stderr

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error: cannot memcpy dynamically sized data
2-
--> $CORE_SRC/intrinsics/mod.rs:3805:9
2+
--> $CORE_SRC/intrinsics/mod.rs:3806:9
33
|
4-
3805 | copy(src, dst, count)
4+
3806 | copy(src, dst, count)
55
| ^^^^^^^^^^^^^^^^^^^^^
66
|
77
note: used from within `core::intrinsics::copy::<f32>`
8-
--> $CORE_SRC/intrinsics/mod.rs:3785:21
8+
--> $CORE_SRC/intrinsics/mod.rs:3786:21
99
|
10-
3785 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
10+
3786 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
1111
| ^^^^
1212
note: called by `ptr_copy::copy_via_raw_ptr`
1313
--> $DIR/ptr_copy.rs:28:18
@@ -28,25 +28,25 @@ note: called by `main`
2828
error: cannot cast between pointer types
2929
from `*f32`
3030
to `*struct () { }`
31-
--> $CORE_SRC/intrinsics/mod.rs:3793:9
31+
--> $CORE_SRC/intrinsics/mod.rs:3794:9
3232
|
33-
3793 | / ub_checks::assert_unsafe_precondition!(
34-
3794 | | check_language_ub,
35-
3795 | | "ptr::copy requires that both pointer arguments are aligned and non-null",
33+
3794 | / ub_checks::assert_unsafe_precondition!(
34+
3795 | | check_language_ub,
35+
3796 | | "ptr::copy requires that both pointer arguments are aligned and non-null",
3636
... |
37-
3803 | | && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
38-
3804 | | );
37+
3804 | | && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
38+
3805 | | );
3939
| |_________^
4040
|
4141
note: used from within `core::intrinsics::copy::<f32>`
42-
--> $CORE_SRC/intrinsics/mod.rs:3793:9
42+
--> $CORE_SRC/intrinsics/mod.rs:3794:9
4343
|
44-
3793 | / ub_checks::assert_unsafe_precondition!(
45-
3794 | | check_language_ub,
46-
3795 | | "ptr::copy requires that both pointer arguments are aligned and non-null",
44+
3794 | / ub_checks::assert_unsafe_precondition!(
45+
3795 | | check_language_ub,
46+
3796 | | "ptr::copy requires that both pointer arguments are aligned and non-null",
4747
... |
48-
3803 | | && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
49-
3804 | | );
48+
3804 | | && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
49+
3805 | | );
5050
| |_________^
5151
note: called by `ptr_copy::copy_via_raw_ptr`
5252
--> $DIR/ptr_copy.rs:28:18

0 commit comments

Comments
 (0)