diff options
| author | bors <bors@rust-lang.org> | 2020-08-07 01:16:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-07 01:16:47 +0000 |
| commit | 6396dbbd6215d86ee9d7dd0c145f9bd77bd752d0 (patch) | |
| tree | 63b08cd33feb0ed6f11aee99948aa1963551a8b6 /src/test | |
| parent | 71f8d0c8f1060bbe74100f29cc6f2da63d697c28 (diff) | |
| parent | 3c131d67382c2e8c9d2fc6b3bc172f0f12e3d952 (diff) | |
Auto merge of #75238 - JohnTitor:rollup-llbk0sq, r=JohnTitor
Rollup of 12 pull requests
Successful merges:
- #74888 (compiletest: ignore-endian-big, fixes #74829, fixes #74885)
- #75175 (Make doctests of Ipv4Addr::from(u32) easier to read)
- #75179 (Remove unused FromInner impl for Ipv4Addr)
- #75181 (Fix typo in `librustc_feature/active.rs`)
- #75183 (Label rustfmt toolstate issues with A-rustfmt)
- #75188 (Handle fieldless tuple structs in diagnostic code)
- #75190 (Clean up E0746 explanation)
- #75210 (Change the type of `AssertModuleSource::available_cgus`.)
- #75211 (Note about endianness of returned value of {integer}::from_be_bytes and friends)
- #75217 (Clean up E0747 explanation)
- #75232 (Fix typo "TraitObligatiom" -> "TraitObligation")
- #75236 (Fix typo "biset" -> "bitset")
Failed merges:
r? @ghost
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/mir-opt/const-promotion-extern-static.rs | 2 | ||||
| -rw-r--r-- | src/test/mir-opt/const_allocation.rs | 2 | ||||
| -rw-r--r-- | src/test/mir-opt/const_allocation2.rs | 2 | ||||
| -rw-r--r-- | src/test/mir-opt/const_allocation3.rs | 2 | ||||
| -rw-r--r-- | src/test/mir-opt/inline/inline-into-box-place.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/privacy/issue-75062-fieldless-tuple-struct.rs | 10 | ||||
| -rw-r--r-- | src/test/ui/privacy/issue-75062-fieldless-tuple-struct.stderr | 15 | ||||
| -rw-r--r-- | src/test/ui/simd/simd-intrinsic-generic-bitmask.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/simd/simd-intrinsic-generic-select.rs | 5 |
9 files changed, 32 insertions, 9 deletions
diff --git a/src/test/mir-opt/const-promotion-extern-static.rs b/src/test/mir-opt/const-promotion-extern-static.rs index e63309a9bd2..9c30e040031 100644 --- a/src/test/mir-opt/const-promotion-extern-static.rs +++ b/src/test/mir-opt/const-promotion-extern-static.rs @@ -1,7 +1,7 @@ +// ignore-endian-big extern "C" { static X: i32; } - static Y: i32 = 42; // EMIT_MIR const_promotion_extern_static.BAR.PromoteTemps.diff diff --git a/src/test/mir-opt/const_allocation.rs b/src/test/mir-opt/const_allocation.rs index bb1c48e8e3c..b0fcb86fcee 100644 --- a/src/test/mir-opt/const_allocation.rs +++ b/src/test/mir-opt/const_allocation.rs @@ -1,5 +1,5 @@ +// ignore-endian-big // EMIT_MIR_FOR_EACH_BIT_WIDTH - static FOO: &[(Option<i32>, &[&str])] = &[(None, &[]), (None, &["foo", "bar"]), (Some(42), &["meh", "mop", "möp"])]; diff --git a/src/test/mir-opt/const_allocation2.rs b/src/test/mir-opt/const_allocation2.rs index 56839255c0e..30afedffb39 100644 --- a/src/test/mir-opt/const_allocation2.rs +++ b/src/test/mir-opt/const_allocation2.rs @@ -1,5 +1,5 @@ +// ignore-endian-big // EMIT_MIR_FOR_EACH_BIT_WIDTH - // EMIT_MIR const_allocation2.main.ConstProp.after.mir fn main() { FOO; diff --git a/src/test/mir-opt/const_allocation3.rs b/src/test/mir-opt/const_allocation3.rs index 2ce289aea3f..ddeb32ab9a5 100644 --- a/src/test/mir-opt/const_allocation3.rs +++ b/src/test/mir-opt/const_allocation3.rs @@ -1,5 +1,5 @@ +// ignore-endian-big // EMIT_MIR_FOR_EACH_BIT_WIDTH - // EMIT_MIR const_allocation3.main.ConstProp.after.mir fn main() { FOO; diff --git a/src/test/mir-opt/inline/inline-into-box-place.rs b/src/test/mir-opt/inline/inline-into-box-place.rs index 30c9a5d6b8f..57298605b18 100644 --- a/src/test/mir-opt/inline/inline-into-box-place.rs +++ b/src/test/mir-opt/inline/inline-into-box-place.rs @@ -1,8 +1,8 @@ +// ignore-endian-big // ignore-wasm32-bare compiled with panic=abort by default // compile-flags: -Z mir-opt-level=3 // EMIT_MIR_FOR_EACH_BIT_WIDTH #![feature(box_syntax)] - // EMIT_MIR inline_into_box_place.main.Inline.diff fn main() { let _x: Box<Vec<u32>> = box Vec::new(); diff --git a/src/test/ui/privacy/issue-75062-fieldless-tuple-struct.rs b/src/test/ui/privacy/issue-75062-fieldless-tuple-struct.rs new file mode 100644 index 00000000000..4601a3d4741 --- /dev/null +++ b/src/test/ui/privacy/issue-75062-fieldless-tuple-struct.rs @@ -0,0 +1,10 @@ +// Regression test for issue #75062 +// Tests that we don't ICE on a privacy error for a fieldless tuple struct. + +mod foo { + struct Bar(); +} + +fn main() { + foo::Bar(); //~ ERROR tuple struct +} diff --git a/src/test/ui/privacy/issue-75062-fieldless-tuple-struct.stderr b/src/test/ui/privacy/issue-75062-fieldless-tuple-struct.stderr new file mode 100644 index 00000000000..14a12003e2d --- /dev/null +++ b/src/test/ui/privacy/issue-75062-fieldless-tuple-struct.stderr @@ -0,0 +1,15 @@ +error[E0603]: tuple struct `Bar` is private + --> $DIR/issue-75062-fieldless-tuple-struct.rs:9:10 + | +LL | foo::Bar(); + | ^^^ private tuple struct + | +note: the tuple struct `Bar` is defined here + --> $DIR/issue-75062-fieldless-tuple-struct.rs:5:5 + | +LL | struct Bar(); + | ^^^^^^^^^^^^^ + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0603`. diff --git a/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs b/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs index a323bd9e82b..8c436841b44 100644 --- a/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs +++ b/src/test/ui/simd/simd-intrinsic-generic-bitmask.rs @@ -2,6 +2,7 @@ #![allow(non_camel_case_types)] // ignore-emscripten +// ignore-endian-big behavior of simd_bitmask is endian-specific // Test that the simd_bitmask intrinsic produces correct results. diff --git a/src/test/ui/simd/simd-intrinsic-generic-select.rs b/src/test/ui/simd/simd-intrinsic-generic-select.rs index 22bda4fc9d9..dc9ec5d2760 100644 --- a/src/test/ui/simd/simd-intrinsic-generic-select.rs +++ b/src/test/ui/simd/simd-intrinsic-generic-select.rs @@ -2,10 +2,7 @@ #![allow(non_camel_case_types)] // ignore-emscripten -// ignore-mips behavior of simd_select_bitmask is endian-specific -// ignore-mips64 behavior of simd_select_bitmask is endian-specific -// ignore-powerpc behavior of simd_select_bitmask is endian-specific -// ignore-powerpc64 behavior of simd_select_bitmask is endian-specific +// ignore-endian-big behavior of simd_select_bitmask is endian-specific // Test that the simd_select intrinsics produces correct results. |
