about summary refs log tree commit diff
path: root/src/test/ui/issues
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2021-07-28 18:28:19 +0900
committerGitHub <noreply@github.com>2021-07-28 18:28:19 +0900
commit23479f716adfbfd424d02a2cf6f4f18f011ffcc2 (patch)
tree6fc26ade76f27316bac76b0b4c51ae571876cd53 /src/test/ui/issues
parent35dddd3deaccb42ad9d47eb72b8a8979d9df7492 (diff)
parentf16ae7ee2673215c0b2f4b363b074f11fdd185f9 (diff)
downloadrust-23479f716adfbfd424d02a2cf6f4f18f011ffcc2.tar.gz
rust-23479f716adfbfd424d02a2cf6f4f18f011ffcc2.zip
Rollup merge of #87501 - spastorino:remove-min-tait, r=oli-obk
Remove min_type_alias_impl_trait in favor of type_alias_impl_trait

r? ``@oli-obk``
Diffstat (limited to 'src/test/ui/issues')
-rw-r--r--src/test/ui/issues/issue-60662.full_tait.stderr11
-rw-r--r--src/test/ui/issues/issue-60662.min_tait.stdout15
-rw-r--r--src/test/ui/issues/issue-60662.rs8
-rw-r--r--src/test/ui/issues/issue-60662.stdout (renamed from src/test/ui/issues/issue-60662.full_tait.stdout)2
4 files changed, 2 insertions, 34 deletions
diff --git a/src/test/ui/issues/issue-60662.full_tait.stderr b/src/test/ui/issues/issue-60662.full_tait.stderr
deleted file mode 100644
index a448f85b762..00000000000
--- a/src/test/ui/issues/issue-60662.full_tait.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-warning: the feature `type_alias_impl_trait` is incomplete and may not be safe to use and/or cause compiler crashes
-  --> $DIR/issue-60662.rs:6:32
-   |
-LL | #![cfg_attr(full_tait, feature(type_alias_impl_trait))]
-   |                                ^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: `#[warn(incomplete_features)]` on by default
-   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
-
-warning: 1 warning emitted
-
diff --git a/src/test/ui/issues/issue-60662.min_tait.stdout b/src/test/ui/issues/issue-60662.min_tait.stdout
deleted file mode 100644
index d0db578f570..00000000000
--- a/src/test/ui/issues/issue-60662.min_tait.stdout
+++ /dev/null
@@ -1,15 +0,0 @@
-// check-pass
-// compile-flags: -Z unpretty=hir
-
-// revisions: min_tait full_tait
-#![feature(min_type_alias_impl_trait)]
-#[prelude_import]
-use ::std::prelude::rust_2015::*;
-#[macro_use]
-extern crate std;
-
-trait Animal { }
-
-fn main() {
-              pub type ServeFut = /*impl Trait*/;
-          }
diff --git a/src/test/ui/issues/issue-60662.rs b/src/test/ui/issues/issue-60662.rs
index 1320d2bbe93..b9faa668b80 100644
--- a/src/test/ui/issues/issue-60662.rs
+++ b/src/test/ui/issues/issue-60662.rs
@@ -1,13 +1,9 @@
 // check-pass
 // compile-flags: -Z unpretty=hir
 
-// revisions: min_tait full_tait
-#![feature(min_type_alias_impl_trait)]
-#![cfg_attr(full_tait, feature(type_alias_impl_trait))]
-//[full_tait]~^ WARN incomplete
+#![feature(type_alias_impl_trait)]
 
-trait Animal {
-}
+trait Animal {}
 
 fn main() {
     pub type ServeFut = impl Animal;
diff --git a/src/test/ui/issues/issue-60662.full_tait.stdout b/src/test/ui/issues/issue-60662.stdout
index 9ee4434d559..14a49f20e6b 100644
--- a/src/test/ui/issues/issue-60662.full_tait.stdout
+++ b/src/test/ui/issues/issue-60662.stdout
@@ -1,8 +1,6 @@
 // check-pass
 // compile-flags: -Z unpretty=hir
 
-// revisions: min_tait full_tait
-#![feature(min_type_alias_impl_trait)]
 #![feature(type_alias_impl_trait)]
 #[prelude_import]
 use ::std::prelude::rust_2015::*;