Auto merge of #52088 - kennytm:rollup, r=kennytm
Rollup of 14 pull requests Successful merges: - #51619 (rust: add initial changes to support powerpc64le musl) - #51793 (Fix variant background color on hover in search results) - #52005 (Update LLVM to bring in a wasm codegen fix) - #52016 (Deduplicate error reports for statics) - #52019 ([cross-lang-lto] Allow the linker to choose the LTO-plugin (which is useful when using LLD)) - #52030 (Any docs preposition change) - #52031 (Strenghten synchronization in `Arc::is_unique`) - #52033 ([Gardening] Update outdated comments: ByVal -> Scalar) - #52055 (Include VS 2017 in error message.) - #52063 (Add a link to the rustc docs) - #52073 (Add a punch card to weird expressions test) - #52080 (Improve dependency deduplication diagnostics) - #52093 (rustc: Update tracking issue for wasm_import_module) - #52096 (Fix typo in cell.rs) Failed merges:
This commit is contained in:
commit
4d9fa2326e
23 changed files with 138 additions and 73 deletions
|
|
@ -16,7 +16,5 @@ extern {
|
|||
static CRASH: () = symbol;
|
||||
//~^ ERROR could not evaluate static initializer
|
||||
//~| tried to read from foreign (extern) static
|
||||
//~^^^ ERROR could not evaluate static initializer
|
||||
//~| tried to read from foreign (extern) static
|
||||
|
||||
fn main() {}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,5 @@ extern {
|
|||
pub static BAZ: u32 = *&error_message_count;
|
||||
//~^ ERROR could not evaluate static initializer
|
||||
//~| tried to read from foreign (extern) static
|
||||
//~^^^ ERROR could not evaluate static initializer
|
||||
//~| tried to read from foreign (extern) static
|
||||
|
||||
fn main() {}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@
|
|||
|
||||
// compile-flags: -Z borrowck=compare
|
||||
|
||||
#![recursion_limit = "128"]
|
||||
|
||||
use std::cell::Cell;
|
||||
use std::mem::swap;
|
||||
|
||||
|
|
@ -121,6 +123,16 @@ fn special_characters() {
|
|||
assert!(!val);
|
||||
}
|
||||
|
||||
fn punch_card() -> impl std::fmt::Debug {
|
||||
..=..=.. .. .. .. .. .. .. .. .. .. .. ..=.. ..
|
||||
..=.. ..=.. .. .. .. .. .. .. .. .. ..=..=..=..
|
||||
..=.. ..=.. ..=.. ..=.. .. ..=..=.. .. ..=.. ..
|
||||
..=..=.. .. ..=.. ..=.. ..=.. .. .. .. ..=.. ..
|
||||
..=.. ..=.. ..=.. ..=.. .. ..=.. .. .. ..=.. ..
|
||||
..=.. ..=.. ..=.. ..=.. .. .. ..=.. .. ..=.. ..
|
||||
..=.. ..=.. .. ..=..=.. ..=..=.. .. .. ..=.. ..
|
||||
}
|
||||
|
||||
pub fn main() {
|
||||
strange();
|
||||
funny();
|
||||
|
|
@ -135,4 +147,5 @@ pub fn main() {
|
|||
fishy();
|
||||
union();
|
||||
special_characters();
|
||||
punch_card();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
|
||||
static FOO: i32 = [][0];
|
||||
//~^ ERROR E0080
|
||||
//~| ERROR E0080
|
||||
|
||||
fn main() {
|
||||
let array = [std::env::args().len()];
|
||||
|
|
|
|||
|
|
@ -4,22 +4,14 @@ error[E0080]: could not evaluate static initializer
|
|||
LL | static FOO: i32 = [][0];
|
||||
| ^^^^^ index out of bounds: the len is 0 but the index is 0
|
||||
|
||||
error[E0080]: could not evaluate static initializer
|
||||
--> $DIR/index_out_of_bounds.rs:11:1
|
||||
|
|
||||
LL | static FOO: i32 = [][0];
|
||||
| ^^^^^^^^^^^^^^^^^^-----^
|
||||
| |
|
||||
| index out of bounds: the len is 0 but the index is 0
|
||||
|
||||
error: index out of bounds: the len is 1 but the index is 1
|
||||
--> $DIR/index_out_of_bounds.rs:17:5
|
||||
--> $DIR/index_out_of_bounds.rs:16:5
|
||||
|
|
||||
LL | array[1]; //~ ERROR index out of bounds
|
||||
| ^^^^^^^^
|
||||
|
|
||||
= note: #[deny(const_err)] on by default
|
||||
|
||||
error: aborting due to 3 previous errors
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
For more information about this error, try `rustc --explain E0080`.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
error[E0658]: experimental attribute (see issue #51088)
|
||||
error[E0658]: experimental attribute (see issue #52090)
|
||||
--> $DIR/feature-gate-wasm_import_module.rs:11:1
|
||||
|
|
||||
LL | #[wasm_import_module = "test"] //~ ERROR: experimental
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue