Skip to content

Commit f503c7f

Browse files
committed
Auto merge of #134292 - matthiaskrgr:rollup-3kbjocl, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #134181 (Tweak multispan rendering to reduce output length) - #134209 (validate `--skip` and `--exclude` paths) - #134231 (rustdoc-search: fix mismatched path when parent re-exported twice) - #134236 (crashes: more tests v2) - #134240 (Only dist `llvm-objcopy` if llvm tools are enabled) - #134244 (rustc_borrowck: Stop suggesting the invalid syntax `&mut raw const`) - #134251 (A bunch of cleanups (part 2)) - #134256 (Use a more precise span in placeholder_type_error_diag) r? `@ghost` `@rustbot` modify labels: rollup
2 parents fe11029 + 4d99deb commit f503c7f

12 files changed

+3
-15
lines changed

src/helpers.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,9 @@ pub fn iter_exported_symbols<'tcx>(
149149
let dependency_formats = tcx.dependency_formats(());
150150
// Find the dependencies of the executable we are running.
151151
let dependency_format = dependency_formats
152-
.iter()
153-
.find(|(crate_type, _)| *crate_type == CrateType::Executable)
152+
.get(&CrateType::Executable)
154153
.expect("interpreting a non-executable crate");
155-
for cnum in dependency_format.1.iter().enumerate().filter_map(|(num, &linkage)| {
154+
for cnum in dependency_format.iter().enumerate().filter_map(|(num, &linkage)| {
156155
// We add 1 to the number because that's what rustc also does everywhere it
157156
// calls `CrateNum::new`...
158157
#[expect(clippy::arithmetic_side_effects)]

tests/fail-dep/concurrency/windows_join_main.stderr

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ note: inside `main`
2424
LL | / thread::spawn(|| {
2525
LL | | unsafe {
2626
LL | | assert_eq!(WaitForSingleObject(MAIN_THREAD, INFINITE), WAIT_OBJECT_0);
27-
LL | | }
28-
LL | | })
27+
... |
2928
LL | | .join()
3029
| |___________^
3130

tests/fail/function_calls/arg_inplace_mutate.stack.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ LL | | let _unit: ();
1414
LL | | {
1515
LL | | let non_copy = S(42);
1616
... |
17-
LL | | }
1817
LL | | }
1918
| |_____^
2019
help: <TAG> is this argument

tests/fail/function_calls/arg_inplace_mutate.tree.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ LL | | let _unit: ();
1616
LL | | {
1717
LL | | let non_copy = S(42);
1818
... |
19-
LL | | }
2019
LL | | }
2120
| |_____^
2221
help: the protected tag <TAG> was created here, in the initial state Reserved

tests/fail/function_calls/arg_inplace_observe_during.stack.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ LL | | let _unit: ();
1414
LL | | {
1515
LL | | let non_copy = S(42);
1616
... |
17-
LL | |
1817
LL | | }
1918
| |_____^
2019
help: <TAG> is this argument

tests/fail/function_calls/arg_inplace_observe_during.tree.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ LL | | let _unit: ();
1616
LL | | {
1717
LL | | let non_copy = S(42);
1818
... |
19-
LL | |
2019
LL | | }
2120
| |_____^
2221
help: the protected tag <TAG> was created here, in the initial state Reserved

tests/fail/function_calls/return_pointer_aliasing_read.stack.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ LL | | {
1414
LL | | let x = 0;
1515
LL | | let ptr = &raw mut x;
1616
... |
17-
LL | | }
1817
LL | | }
1918
| |_____^
2019
help: <TAG> is this argument

tests/fail/function_calls/return_pointer_aliasing_read.tree.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ LL | | {
1616
LL | | let x = 0;
1717
LL | | let ptr = &raw mut x;
1818
... |
19-
LL | | }
2019
LL | | }
2120
| |_____^
2221
help: the protected tag <TAG> was created here, in the initial state Reserved

tests/fail/function_calls/return_pointer_aliasing_write.stack.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ LL | | {
1414
LL | | let _x = 0;
1515
LL | | let ptr = &raw mut _x;
1616
... |
17-
LL | | }
1817
LL | | }
1918
| |_____^
2019
help: <TAG> is this argument

tests/fail/function_calls/return_pointer_aliasing_write.tree.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ LL | | {
1616
LL | | let _x = 0;
1717
LL | | let ptr = &raw mut _x;
1818
... |
19-
LL | | }
2019
LL | | }
2120
| |_____^
2221
help: the protected tag <TAG> was created here, in the initial state Reserved

tests/fail/function_calls/return_pointer_aliasing_write_tail_call.stack.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ LL | | {
1414
LL | | let _x = 0;
1515
LL | | let ptr = &raw mut _x;
1616
... |
17-
LL | | }
1817
LL | | }
1918
| |_____^
2019
help: <TAG> is this argument

tests/fail/function_calls/return_pointer_aliasing_write_tail_call.tree.stderr

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ LL | | {
1616
LL | | let _x = 0;
1717
LL | | let ptr = &raw mut _x;
1818
... |
19-
LL | | }
2019
LL | | }
2120
| |_____^
2221
help: the protected tag <TAG> was created here, in the initial state Reserved

0 commit comments

Comments
 (0)