Skip to content

Commit 46a1374

Browse files
borsbors
committed
Auto merge of #147428 - matthiaskrgr:rollup-k3nlxlu, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang/rust#145495 (Use declarative macro for `#[derive(TryFromU32)]`) - rust-lang/rust#147165 (test: Subtract code_offset from width for ui_testing) - rust-lang/rust#147354 (Fix wrong span for hightlight for duplicated diff lines) - rust-lang/rust#147395 (Improve diagnostics: update note and add help message) - rust-lang/rust#147396 (Fluent tidy improvements) - rust-lang/rust#147407 (Update books) - rust-lang/rust#147413 (don't panic on extern with just multiple quotes in the name) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 9153482 + cb2a31a commit 46a1374

9 files changed

+28
-28
lines changed

‎tests/fail-dep/concurrency/libc_pthread_join_joined.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: Undefined Behavior: trying to join an already joined thread
22
--> tests/fail-dep/concurrency/libc_pthread_join_joined.rs:LL:CC
33
|
4-
LL | assert_eq!(libc::pthread_join(native, ptr::null_mut()), 0);
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
4+
LL | ... assert_eq!(libc::pthread_join(native, ptr::null_mut()), 0);
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

‎tests/fail-dep/concurrency/libc_pthread_join_main.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: Undefined Behavior: trying to join a detached thread
22
--> tests/fail-dep/concurrency/libc_pthread_join_main.rs:LL:CC
33
|
4-
LL | assert_eq!(libc::pthread_join(thread_id, ptr::null_mut()), 0);
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
4+
LL | ... assert_eq!(libc::pthread_join(thread_id, ptr::null_mut()), 0);
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

‎tests/fail/data_race/dealloc_read_race1.stderr‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error: Undefined Behavior: Data race detected between (1) non-atomic read on thread `unnamed-ID` and (2) deallocation on thread `unnamed-ID` at ALLOC
22
--> tests/fail/data_race/dealloc_read_race1.rs:LL:CC
33
|
4-
LL | / __rust_dealloc(
5-
LL | |
6-
LL | | ptr.0 as *mut _,
7-
LL | | std::mem::size_of::<usize>(),
8-
LL | | std::mem::align_of::<usize>(),
9-
LL | | );
10-
| |_____________^ (2) just happened here
4+
LL | / ... __rust_dealloc(
5+
LL | | ...
6+
LL | | ... ptr.0 as *mut _,
7+
LL | | ... std::mem::size_of::<usize>(),
8+
LL | | ... std::mem::align_of::<usize>(),
9+
LL | | ... );
10+
| |_______^ (2) just happened here
1111
|
1212
help: and (1) occurred earlier here
1313
--> tests/fail/data_race/dealloc_read_race1.rs:LL:CC

‎tests/fail/data_race/dealloc_read_race_stack.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: Undefined Behavior: Data race detected between (1) non-atomic read on thread `unnamed-ID` and (2) deallocation on thread `unnamed-ID` at ALLOC
22
--> tests/fail/data_race/dealloc_read_race_stack.rs:LL:CC
33
|
4-
LL | }
5-
| ^ (2) just happened here
4+
LL | ... }
5+
| ^ (2) just happened here
66
|
77
help: and (1) occurred earlier here
88
--> tests/fail/data_race/dealloc_read_race_stack.rs:LL:CC

‎tests/fail/data_race/dealloc_write_race1.stderr‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error: Undefined Behavior: Data race detected between (1) non-atomic write on thread `unnamed-ID` and (2) deallocation on thread `unnamed-ID` at ALLOC
22
--> tests/fail/data_race/dealloc_write_race1.rs:LL:CC
33
|
4-
LL | / __rust_dealloc(
5-
LL | |
6-
LL | | ptr.0 as *mut _,
7-
LL | | std::mem::size_of::<usize>(),
8-
LL | | std::mem::align_of::<usize>(),
9-
LL | | );
10-
| |_____________^ (2) just happened here
4+
LL | / ... __rust_dealloc(
5+
LL | | ...
6+
LL | | ... ptr.0 as *mut _,
7+
LL | | ... std::mem::size_of::<usize>(),
8+
LL | | ... std::mem::align_of::<usize>(),
9+
LL | | ... );
10+
| |_______^ (2) just happened here
1111
|
1212
help: and (1) occurred earlier here
1313
--> tests/fail/data_race/dealloc_write_race1.rs:LL:CC

‎tests/fail/data_race/dealloc_write_race_stack.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: Undefined Behavior: Data race detected between (1) non-atomic write on thread `unnamed-ID` and (2) deallocation on thread `unnamed-ID` at ALLOC
22
--> tests/fail/data_race/dealloc_write_race_stack.rs:LL:CC
33
|
4-
LL | }
5-
| ^ (2) just happened here
4+
LL | ... }
5+
| ^ (2) just happened here
66
|
77
help: and (1) occurred earlier here
88
--> tests/fail/data_race/dealloc_write_race_stack.rs:LL:CC

‎tests/fail/intrinsics/copy_unaligned.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: Undefined Behavior: accessing memory with alignment ALIGN, but alignment ALIGN is required
22
--> tests/fail/intrinsics/copy_unaligned.rs:LL:CC
33
|
4-
LL | std::intrinsics::copy_nonoverlapping(&data[5], ptr, 0);
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
4+
LL | ... std::intrinsics::copy_nonoverlapping(&data[5], ptr, 0);
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

‎tests/fail/intrinsics/simd-float-to-int.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: Undefined Behavior: `simd_cast` intrinsic called on 3.40282347E+38f32 which cannot be represented in target type `i32`
22
--> tests/fail/intrinsics/simd-float-to-int.rs:LL:CC
33
|
4-
LL | let _x: i32x2 = f32x2::from_array([f32::MAX, f32::MIN]).to_int_unchecked();
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
4+
LL | ... let _x: i32x2 = f32x2::from_array([f32::MAX, f32::MIN]).to_int_unchecked();
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information

‎tests/fail/stacked_borrows/retag_data_race_read.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: Undefined Behavior: Data race detected between (1) retag read on thread `unnamed-ID` and (2) non-atomic write on thread `unnamed-ID` at ALLOC
22
--> tests/fail/stacked_borrows/retag_data_race_read.rs:LL:CC
33
|
4-
LL | *p = 5;
5-
| ^^^^^^ (2) just happened here
4+
LL | ... *p = 5;
5+
| ^^^^^^ (2) just happened here
66
|
77
help: and (1) occurred earlier here
88
--> tests/fail/stacked_borrows/retag_data_race_read.rs:LL:CC

0 commit comments

Comments
 (0)