about summary refs log tree commit diff
path: root/src/test/ui
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-03-04 02:53:40 +0000
committerbors <bors@rust-lang.org>2022-03-04 02:53:40 +0000
commit8fa5d74a7cb01ceaf1a07aa6fcaf42137d8bda58 (patch)
tree3392ba5314bbc3ef99a69a9f7a38a5d4d9f39ce6 /src/test/ui
parent6d7684101a51f1c375ec84aef5d2fbdeb214bbc2 (diff)
parent733a1a8ca42347a19c0d8a143fb090a9f0c2b810 (diff)
downloadrust-8fa5d74a7cb01ceaf1a07aa6fcaf42137d8bda58.tar.gz
rust-8fa5d74a7cb01ceaf1a07aa6fcaf42137d8bda58.zip
Auto merge of #94588 - Dylan-DPC:rollup-7pxd0i3, r=Dylan-DPC
Rollup of 10 pull requests

Successful merges:

 - #88805 (Clarification of default socket flags)
 - #93418 (rustdoc & doc: no `shortcut` for `rel="icon"`)
 - #93913 (Remove the everybody loops pass)
 - #93965 (Make regular stdio lock() return 'static handles)
 - #94339 (ARM: Only allow using d16-d31 with asm! when supported by the target)
 - #94404 (Make Ord and PartialOrd opt-out in `newtype_index`)
 - #94466 (bootstrap: correct reading of flags for llvm)
 - #94572 (Use `HandleOrNull` and `HandleOrInvalid` in the Windows FFI bindings.)
 - #94575 (CTFE SwitchInt: update comment)
 - #94582 (Fix a bug in `x.py fmt` that prevents some files being formatted.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/ui')
-rw-r--r--src/test/ui/lint/issue-87308.rs12
-rw-r--r--src/test/ui/lint/issue-87308.stdout14
-rw-r--r--src/test/ui/repr/issue-83921-pretty.normal.stderr9
-rw-r--r--src/test/ui/repr/issue-83921-pretty.pretty.stdout18
-rw-r--r--src/test/ui/repr/issue-83921-pretty.rs14
5 files changed, 0 insertions, 67 deletions
diff --git a/src/test/ui/lint/issue-87308.rs b/src/test/ui/lint/issue-87308.rs
deleted file mode 100644
index 48fbb2a0139..00000000000
--- a/src/test/ui/lint/issue-87308.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Regression test for issue #87308.
-
-// compile-flags: -Zunpretty=everybody_loops
-// check-pass
-
-macro_rules! foo {
-    () => { break 'x; }
-}
-
-pub fn main() {
-    'x: loop { foo!() }
-}
diff --git a/src/test/ui/lint/issue-87308.stdout b/src/test/ui/lint/issue-87308.stdout
deleted file mode 100644
index 4f81ee8b7e6..00000000000
--- a/src/test/ui/lint/issue-87308.stdout
+++ /dev/null
@@ -1,14 +0,0 @@
-#![feature(prelude_import)]
-#![no_std]
-#[prelude_import]
-use ::std::prelude::rust_2015::*;
-#[macro_use]
-extern crate std;
-// Regression test for issue #87308.
-
-// compile-flags: -Zunpretty=everybody_loops
-// check-pass
-
-macro_rules! foo { () => { break 'x ; } }
-
-pub fn main() { loop {} }
diff --git a/src/test/ui/repr/issue-83921-pretty.normal.stderr b/src/test/ui/repr/issue-83921-pretty.normal.stderr
deleted file mode 100644
index 6b7e831ed2f..00000000000
--- a/src/test/ui/repr/issue-83921-pretty.normal.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0565]: meta item in `repr` must be an identifier
-  --> $DIR/issue-83921-pretty.rs:10:8
-   |
-LL | #[repr("C")]
-   |        ^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0565`.
diff --git a/src/test/ui/repr/issue-83921-pretty.pretty.stdout b/src/test/ui/repr/issue-83921-pretty.pretty.stdout
deleted file mode 100644
index aaf3993538a..00000000000
--- a/src/test/ui/repr/issue-83921-pretty.pretty.stdout
+++ /dev/null
@@ -1,18 +0,0 @@
-#![feature(prelude_import)]
-#![no_std]
-#[prelude_import]
-use ::std::prelude::rust_2015::*;
-#[macro_use]
-extern crate std;
-// Regression test for #83921. A `delay_span_bug()` call was issued, but the
-// error was never reported because the pass responsible for detecting and
-// reporting the error does not run in certain modes of pretty-printing.
-
-// Make sure the error is reported if we do not just pretty-print:
-// revisions: pretty normal
-// [pretty]compile-flags: -Zunpretty=everybody_loops
-// [pretty]check-pass
-#[repr("C")]
-struct A {}
-
-fn main() { loop {} }
diff --git a/src/test/ui/repr/issue-83921-pretty.rs b/src/test/ui/repr/issue-83921-pretty.rs
deleted file mode 100644
index d5d36470f11..00000000000
--- a/src/test/ui/repr/issue-83921-pretty.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Regression test for #83921. A `delay_span_bug()` call was issued, but the
-// error was never reported because the pass responsible for detecting and
-// reporting the error does not run in certain modes of pretty-printing.
-
-// Make sure the error is reported if we do not just pretty-print:
-// revisions: pretty normal
-// [pretty]compile-flags: -Zunpretty=everybody_loops
-// [pretty]check-pass
-
-#[repr("C")]
-//[normal]~^ ERROR: meta item in `repr` must be an identifier [E0565]
-struct A {}
-
-fn main() {}