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
This commit is contained in:
commit
03314912f1
7 changed files with 18 additions and 5 deletions
|
@ -859,6 +859,7 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MirNeighborCollector<'a, 'tcx> {
|
||||||
|lint| {
|
|lint| {
|
||||||
let mut err = lint.build(&format!("moving {} bytes", layout.size.bytes()));
|
let mut err = lint.build(&format!("moving {} bytes", layout.size.bytes()));
|
||||||
err.span_label(source_info.span, "value moved from here");
|
err.span_label(source_info.span, "value moved from here");
|
||||||
|
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()));
|
||||||
err.emit();
|
err.emit();
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
|
@ -522,7 +522,7 @@ pub mod guard {
|
||||||
// new thread
|
// new thread
|
||||||
stack_ptr.addr() - current_stack.ss_size
|
stack_ptr.addr() - current_stack.ss_size
|
||||||
};
|
};
|
||||||
Some(stack_ptr.with_addr(stack_addr))
|
Some(stack_ptr.with_addr(stackaddr))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(any(
|
#[cfg(any(
|
||||||
|
|
|
@ -1998,7 +1998,6 @@ impl Step for Crate {
|
||||||
compile::std_cargo(builder, target, compiler.stage, &mut cargo);
|
compile::std_cargo(builder, target, compiler.stage, &mut cargo);
|
||||||
}
|
}
|
||||||
Mode::Rustc => {
|
Mode::Rustc => {
|
||||||
builder.ensure(compile::Rustc { compiler, target });
|
|
||||||
compile::rustc_cargo(builder, &mut cargo, target);
|
compile::rustc_cargo(builder, &mut cargo, target);
|
||||||
}
|
}
|
||||||
_ => panic!("can only test libraries"),
|
_ => panic!("can only test libraries"),
|
||||||
|
|
|
@ -465,7 +465,7 @@ fn extra_info_tags(item: &clean::Item, parent: &clean::Item, tcx: TyCtxt<'_>) ->
|
||||||
fn item_function(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, f: &clean::Function) {
|
fn item_function(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, f: &clean::Function) {
|
||||||
let header = it.fn_header(cx.tcx()).expect("printing a function which isn't a function");
|
let header = it.fn_header(cx.tcx()).expect("printing a function which isn't a function");
|
||||||
let constness = print_constness_with_space(&header.constness, it.const_stability(cx.tcx()));
|
let constness = print_constness_with_space(&header.constness, it.const_stability(cx.tcx()));
|
||||||
let unsafety = header.unsafety.print_with_space().to_string();
|
let unsafety = header.unsafety.print_with_space();
|
||||||
let abi = print_abi_with_space(header.abi).to_string();
|
let abi = print_abi_with_space(header.abi).to_string();
|
||||||
let asyncness = header.asyncness.print_with_space();
|
let asyncness = header.asyncness.print_with_space();
|
||||||
let visibility = it.visibility.print_with_space(it.def_id, cx).to_string();
|
let visibility = it.visibility.print_with_space(it.def_id, cx).to_string();
|
||||||
|
|
|
@ -2,8 +2,7 @@
|
||||||
goto: file://|DOC_PATH|/test_docs/index.html
|
goto: file://|DOC_PATH|/test_docs/index.html
|
||||||
size: (900, 1000)
|
size: (900, 1000)
|
||||||
write: (".search-input", "test")
|
write: (".search-input", "test")
|
||||||
// Waiting for the search results to appear...
|
wait-for: "#search-settings"
|
||||||
wait-for: "#titles"
|
|
||||||
// The width is returned by "getComputedStyle" which returns the exact number instead of the
|
// The width is returned by "getComputedStyle" which returns the exact number instead of the
|
||||||
// CSS rule which is "50%"...
|
// CSS rule which is "50%"...
|
||||||
assert-css: (".search-results div.desc", {"width": "295px"})
|
assert-css: (".search-results div.desc", {"width": "295px"})
|
||||||
|
|
|
@ -15,24 +15,31 @@ note: the lint level is defined here
|
||||||
|
|
|
|
||||||
LL | #![deny(large_assignments)]
|
LL | #![deny(large_assignments)]
|
||||||
| ^^^^^^^^^^^^^^^^^
|
| ^^^^^^^^^^^^^^^^^
|
||||||
|
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
|
||||||
|
|
||||||
error: moving 10024 bytes
|
error: moving 10024 bytes
|
||||||
--> $DIR/large_moves.rs:18:14
|
--> $DIR/large_moves.rs:18:14
|
||||||
|
|
|
|
||||||
LL | let z = (x, 42);
|
LL | let z = (x, 42);
|
||||||
| ^ value moved from here
|
| ^ value moved from here
|
||||||
|
|
|
||||||
|
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
|
||||||
|
|
||||||
error: moving 10024 bytes
|
error: moving 10024 bytes
|
||||||
--> $DIR/large_moves.rs:18:13
|
--> $DIR/large_moves.rs:18:13
|
||||||
|
|
|
|
||||||
LL | let z = (x, 42);
|
LL | let z = (x, 42);
|
||||||
| ^^^^^^^ value moved from here
|
| ^^^^^^^ value moved from here
|
||||||
|
|
|
||||||
|
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
|
||||||
|
|
||||||
error: moving 10024 bytes
|
error: moving 10024 bytes
|
||||||
--> $DIR/large_moves.rs:20:13
|
--> $DIR/large_moves.rs:20:13
|
||||||
|
|
|
|
||||||
LL | let a = z.0;
|
LL | let a = z.0;
|
||||||
| ^^^ value moved from here
|
| ^^^ value moved from here
|
||||||
|
|
|
||||||
|
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
|
||||||
|
|
||||||
error: aborting due to 4 previous errors
|
error: aborting due to 4 previous errors
|
||||||
|
|
||||||
|
|
|
@ -15,24 +15,31 @@ note: the lint level is defined here
|
||||||
|
|
|
|
||||||
LL | #![deny(large_assignments)]
|
LL | #![deny(large_assignments)]
|
||||||
| ^^^^^^^^^^^^^^^^^
|
| ^^^^^^^^^^^^^^^^^
|
||||||
|
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
|
||||||
|
|
||||||
error: moving 10024 bytes
|
error: moving 10024 bytes
|
||||||
--> $DIR/large_moves.rs:18:14
|
--> $DIR/large_moves.rs:18:14
|
||||||
|
|
|
|
||||||
LL | let z = (x, 42);
|
LL | let z = (x, 42);
|
||||||
| ^ value moved from here
|
| ^ value moved from here
|
||||||
|
|
|
||||||
|
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
|
||||||
|
|
||||||
error: moving 10024 bytes
|
error: moving 10024 bytes
|
||||||
--> $DIR/large_moves.rs:18:13
|
--> $DIR/large_moves.rs:18:13
|
||||||
|
|
|
|
||||||
LL | let z = (x, 42);
|
LL | let z = (x, 42);
|
||||||
| ^^^^^^^ value moved from here
|
| ^^^^^^^ value moved from here
|
||||||
|
|
|
||||||
|
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
|
||||||
|
|
||||||
error: moving 10024 bytes
|
error: moving 10024 bytes
|
||||||
--> $DIR/large_moves.rs:20:13
|
--> $DIR/large_moves.rs:20:13
|
||||||
|
|
|
|
||||||
LL | let a = z.0;
|
LL | let a = z.0;
|
||||||
| ^^^ value moved from here
|
| ^^^ value moved from here
|
||||||
|
|
|
||||||
|
= note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
|
||||||
|
|
||||||
error: aborting due to 4 previous errors
|
error: aborting due to 4 previous errors
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue