Skip to content

Commit 1f417e5

Browse files
authored
Unrolled build for #151067
Rollup merge of #151067 - ui_test_no_should_fail, r=lqd Avoid should-fail in two ui tests and a codegen-llvm test `should-fail` is only meant for testing the compiletest framework itself. It checks that the test runner itself panicked. With this there are still a bunch of rustdoc-html tests that use it due to this test suite not supporting anything like `//@ doc-fail`.
2 parents 2fd6efc + 15112ee commit 1f417e5

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

tests/codegen-llvm/option-niche-unfixed/option-nonzero-eq.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
//@ should-fail
1+
//@ known-bug: #49892
22
//@ compile-flags: -Copt-level=3 -Zmerge-functions=disabled
3-
//! FIXME(#49892)
43
//! Test that the derived implementation of `PartialEq` for `Option` is not fully
54
//! optimized by LLVM. If this starts passing, the test and manual impl should
65
//! be removed.
@@ -18,7 +17,7 @@ pub enum Option<T> {
1817
#[no_mangle]
1918
pub fn non_zero_eq(l: Option<NonZero<u32>>, r: Option<NonZero<u32>>) -> bool {
2019
// CHECK: start:
21-
// CHECK-NEXT: icmp eq i32
22-
// CHECK-NEXT: ret i1
20+
// COMMENTEDCHECK-NEXT: icmp eq i32
21+
// COMMENTEDCHECK-NEXT: ret i1
2322
l == r
2423
}

tests/ui/borrowck/two-phase-reservation-sharing-interference.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// The nll_beyond revision is disabled due to missing support from two-phase beyond autorefs
44
//@ unused-revision-names: nll_beyond
55
//@[nll_beyond]compile-flags: -Z two-phase-beyond-autoref
6-
//@[nll_beyond]should-fail
6+
//@[nll_beyond]check-fail
77

88
// This is a corner case that the current implementation is (probably)
99
// treating more conservatively than is necessary. But it also does

tests/ui/type-inference/box_has_sigdrop.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ should-fail
1+
//@ known-bug: unknown
22
//@ compile-flags: -Wrust-2021-incompatible-closure-captures
33
// Inference, canonicalization, and significant drops should work nicely together.
44
// Related issue: #86868

0 commit comments

Comments
 (0)