From a1f81ff0ad112d1d8e1ce86df1feb8abcdac76b6 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Wed, 29 Apr 2020 11:52:02 -0400
Subject: [PATCH 1/3] rustdoc supports const re-exports

---
 .../{issue-27362.rs => issue-27362-aux.rs}         |  0
 src/test/rustdoc/issue-27362.rs                    | 14 +++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename src/test/rustdoc/auxiliary/{issue-27362.rs => issue-27362-aux.rs} (100%)

diff --git a/src/test/rustdoc/auxiliary/issue-27362.rs b/src/test/rustdoc/auxiliary/issue-27362-aux.rs
similarity index 100%
rename from src/test/rustdoc/auxiliary/issue-27362.rs
rename to src/test/rustdoc/auxiliary/issue-27362-aux.rs
diff --git a/src/test/rustdoc/issue-27362.rs b/src/test/rustdoc/issue-27362.rs
index 3f3878350d5..1cbba4b663d 100644
--- a/src/test/rustdoc/issue-27362.rs
+++ b/src/test/rustdoc/issue-27362.rs
@@ -1,10 +1,10 @@
-// aux-build:issue-27362.rs
+// aux-build:issue-27362-aux.rs
 // ignore-cross-compile
-// ignore-test This test fails on beta/stable #32019
 
-extern crate issue_27362;
-pub use issue_27362 as quux;
+extern crate issue_27362_aux;
 
-// @matches issue_27362/quux/fn.foo.html '//pre' "pub const fn foo()"
-// @matches issue_27362/quux/fn.bar.html '//pre' "pub const unsafe fn bar()"
-// @matches issue_27362/quux/struct.Foo.html '//code' "const unsafe fn baz()"
+pub use issue_27362_aux::*;
+
+// @matches issue_27362/fn.foo.html '//pre' "pub const fn foo()"
+// @matches issue_27362/fn.bar.html '//pre' "pub const unsafe fn bar()"
+// @matches issue_27362/struct.Foo.html '//code' "const unsafe fn baz()"

From 70fafed3c8c48062617a2811d0cd3e0fafcf3319 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Thu, 30 Apr 2020 09:55:15 -0400
Subject: [PATCH 2/3] Remove unsized enum test

This was already tested (at least) by src/test/ui/unsized/unsized-enum2.rs
---
 src/test/ui/issues/issue-17025.rs | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 src/test/ui/issues/issue-17025.rs

diff --git a/src/test/ui/issues/issue-17025.rs b/src/test/ui/issues/issue-17025.rs
deleted file mode 100644
index 6b7b6d010aa..00000000000
--- a/src/test/ui/issues/issue-17025.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// ignore-test the unsized enum no longer compiles
-
-enum A {
-    B(char),
-    C([Box<A>]),
-}
-
-fn c(c:char) {
-    A::B(c);
-    //~^ ERROR cannot move a value of type A: the size of A cannot be statically determined
-}
-
-pub fn main() {}

From bfed215cedceecb4e4c45ccf48d86b4a8df3ae38 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Thu, 30 Apr 2020 10:23:45 -0400
Subject: [PATCH 3/3] Remove ignored type alias test

This is tracked by a GH issue 17164, and having an ignored test for it isn't
helpful.
---
 .../fully-qualified-type-name3.rs                  | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 src/test/ui/fully-qualified-type/fully-qualified-type-name3.rs

diff --git a/src/test/ui/fully-qualified-type/fully-qualified-type-name3.rs b/src/test/ui/fully-qualified-type/fully-qualified-type-name3.rs
deleted file mode 100644
index 22faa66d9fb..00000000000
--- a/src/test/ui/fully-qualified-type/fully-qualified-type-name3.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Test that we use fully-qualified type names in error messages.
-
-// ignore-test
-
-type T1 = usize;
-type T2 = isize;
-
-fn bar(x: T1) -> T2 {
-    return x;
-    //~^ ERROR mismatched types: expected `T2`, found `T1`
-}
-
-fn main() {
-}