diff options
| author | bors <bors@rust-lang.org> | 2025-02-12 20:26:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-12 20:26:35 +0000 |
| commit | ef148cd7eb00a5a973130dc6473da71fd6c487ee (patch) | |
| tree | d355ad9542f2c7b39e7ab32b08b8b670869ebbcd /library | |
| parent | ced8e650cddbafad92094b2c89dee97b8a807d9c (diff) | |
| parent | 8567fbb4b5b5153a7789d7eb76a8a46700183a1c (diff) | |
| download | rust-ef148cd7eb00a5a973130dc6473da71fd6c487ee.tar.gz rust-ef148cd7eb00a5a973130dc6473da71fd6c487ee.zip | |
Auto merge of #136943 - GuillaumeGomez:rollup-amtd3mq, r=GuillaumeGomez
Rollup of 10 pull requests Successful merges: - #136758 (tests: `-Copt-level=3` instead of `-O` in assembly tests) - #136761 (tests: `-Copt-level=3` instead of `-O` in codegen tests) - #136784 (Nuke `Buffer` abstraction from `librustdoc`, take 2 💣) - #136838 (Check whole `Unsize` predicate for escaping bound vars) - #136848 (add docs and ut for bootstrap util cache) - #136871 (dev-guide: Link to `t-lang` procedures for new features) - #136890 (Change swap_nonoverlapping from lang to library UB) - #136901 (compiler: give `ExternAbi` truly stable `Hash` and `Ord`) - #136907 (compiler: Make middle errors `pub(crate)` and bury the dead code) - #136916 (use cc archiver as default in `cc2ar`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library')
| -rw-r--r-- | library/core/src/ptr/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/core/src/ptr/mod.rs b/library/core/src/ptr/mod.rs index e1348552b65..eb99be817a2 100644 --- a/library/core/src/ptr/mod.rs +++ b/library/core/src/ptr/mod.rs @@ -1070,7 +1070,7 @@ pub const unsafe fn swap<T>(x: *mut T, y: *mut T) { #[rustc_diagnostic_item = "ptr_swap_nonoverlapping"] pub const unsafe fn swap_nonoverlapping<T>(x: *mut T, y: *mut T, count: usize) { ub_checks::assert_unsafe_precondition!( - check_language_ub, + check_library_ub, "ptr::swap_nonoverlapping requires that both pointer arguments are aligned and non-null \ and the specified memory ranges do not overlap", ( |