Skip to content

Commit 0331491

Browse files
committed
Auto merge of #95511 - Dylan-DPC:rollup-4n880fd, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #95445 (Don't build the full compiler before running unit tests) - #95470 (Fix last rustdoc-gui spurious test) - #95478 (Add note to the move size diagnostic) - #95495 (Remove unneeded `to_string` call) - #95505 (Fix library/std compilation on openbsd.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents df20355 + 0b71ca8 commit 0331491

File tree

7 files changed

+18
-5
lines changed

7 files changed

+18
-5
lines changed

Diff for: compiler/rustc_monomorphize/src/collector.rs

+1
Original file line numberDiff line numberDiff line change
@@ -859,6 +859,7 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MirNeighborCollector<'a, 'tcx> {
859859
|lint| {
860860
let mut err = lint.build(&format!("moving {} bytes", layout.size.bytes()));
861861
err.span_label(source_info.span, "value moved from here");
862+
err.note(&format!(r#"The current maximum size is {}, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`"#, limit.bytes()));
862863
err.emit();
863864
},
864865
);

Diff for: library/std/src/sys/unix/thread.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ pub mod guard {
522522
// new thread
523523
stack_ptr.addr() - current_stack.ss_size
524524
};
525-
Some(stack_ptr.with_addr(stack_addr))
525+
Some(stack_ptr.with_addr(stackaddr))
526526
}
527527

528528
#[cfg(any(

Diff for: src/bootstrap/test.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1998,7 +1998,6 @@ impl Step for Crate {
19981998
compile::std_cargo(builder, target, compiler.stage, &mut cargo);
19991999
}
20002000
Mode::Rustc => {
2001-
builder.ensure(compile::Rustc { compiler, target });
20022001
compile::rustc_cargo(builder, &mut cargo, target);
20032002
}
20042003
_ => panic!("can only test libraries"),

Diff for: src/librustdoc/html/render/print_item.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ fn extra_info_tags(item: &clean::Item, parent: &clean::Item, tcx: TyCtxt<'_>) ->
465465
fn item_function(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, f: &clean::Function) {
466466
let header = it.fn_header(cx.tcx()).expect("printing a function which isn't a function");
467467
let constness = print_constness_with_space(&header.constness, it.const_stability(cx.tcx()));
468-
let unsafety = header.unsafety.print_with_space().to_string();
468+
let unsafety = header.unsafety.print_with_space();
469469
let abi = print_abi_with_space(header.abi).to_string();
470470
let asyncness = header.asyncness.print_with_space();
471471
let visibility = it.visibility.print_with_space(it.def_id, cx).to_string();

Diff for: src/test/rustdoc-gui/search-result-display.goml

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
goto: file://|DOC_PATH|/test_docs/index.html
33
size: (900, 1000)
44
write: (".search-input", "test")
5-
// Waiting for the search results to appear...
6-
wait-for: "#titles"
5+
wait-for: "#search-settings"
76
// The width is returned by "getComputedStyle" which returns the exact number instead of the
87
// CSS rule which is "50%"...
98
assert-css: (".search-results div.desc", {"width": "295px"})

Diff for: src/test/ui/async-await/large_moves.attribute.stderr

+7
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,31 @@ note: the lint level is defined here
1515
|
1616
LL | #![deny(large_assignments)]
1717
| ^^^^^^^^^^^^^^^^^
18+
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
1819

1920
error: moving 10024 bytes
2021
--> $DIR/large_moves.rs:18:14
2122
|
2223
LL | let z = (x, 42);
2324
| ^ value moved from here
25+
|
26+
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
2427

2528
error: moving 10024 bytes
2629
--> $DIR/large_moves.rs:18:13
2730
|
2831
LL | let z = (x, 42);
2932
| ^^^^^^^ value moved from here
33+
|
34+
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
3035

3136
error: moving 10024 bytes
3237
--> $DIR/large_moves.rs:20:13
3338
|
3439
LL | let a = z.0;
3540
| ^^^ value moved from here
41+
|
42+
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
3643

3744
error: aborting due to 4 previous errors
3845

Diff for: src/test/ui/async-await/large_moves.option.stderr

+7
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,31 @@ note: the lint level is defined here
1515
|
1616
LL | #![deny(large_assignments)]
1717
| ^^^^^^^^^^^^^^^^^
18+
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
1819

1920
error: moving 10024 bytes
2021
--> $DIR/large_moves.rs:18:14
2122
|
2223
LL | let z = (x, 42);
2324
| ^ value moved from here
25+
|
26+
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
2427

2528
error: moving 10024 bytes
2629
--> $DIR/large_moves.rs:18:13
2730
|
2831
LL | let z = (x, 42);
2932
| ^^^^^^^ value moved from here
33+
|
34+
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
3035

3136
error: moving 10024 bytes
3237
--> $DIR/large_moves.rs:20:13
3338
|
3439
LL | let a = z.0;
3540
| ^^^ value moved from here
41+
|
42+
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
3643

3744
error: aborting due to 4 previous errors
3845

0 commit comments

Comments
 (0)