From 4029a0198433a4b03dc4b4529164ee4872fc2834 Mon Sep 17 00:00:00 2001 From: Alex Burka Date: Sun, 3 Dec 2017 12:57:54 -0500 Subject: [PATCH] error on any use of trait alias --- src/librustc_typeck/collect.rs | 5 ++-- src/librustc_typeck/diagnostics.rs | 1 + src/test/compile-fail/trait-alias.rs | 2 ++ src/test/{run-pass => ui}/trait-alias.rs | 12 ++++---- src/test/ui/trait-alias.stderr | 38 ++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 9 deletions(-) rename src/test/{run-pass => ui}/trait-alias.rs (76%) create mode 100644 src/test/ui/trait-alias.stderr diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 918146605fd4..3d4d8e65f699 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -442,9 +442,8 @@ fn convert_item<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, item_id: ast::NodeId) { tcx.predicates_of(def_id); }, hir::ItemTraitAlias(..) => { - tcx.generics_of(def_id); - tcx.trait_def(def_id); - tcx.predicates_of(def_id); + span_err!(tcx.sess, it.span, E0645, + "trait aliases are not yet implemented (see issue #41517)"); }, hir::ItemStruct(ref struct_def, _) | hir::ItemUnion(ref struct_def, _) => { diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs index 328b7f9fdefc..770d0cd4f1fc 100644 --- a/src/librustc_typeck/diagnostics.rs +++ b/src/librustc_typeck/diagnostics.rs @@ -4721,4 +4721,5 @@ register_diagnostics! { E0632, // cannot provide explicit type parameters when `impl Trait` is used in // argument position. E0641, // cannot cast to/from a pointer with an unknown kind + E0645, // trait aliases not finished } diff --git a/src/test/compile-fail/trait-alias.rs b/src/test/compile-fail/trait-alias.rs index de87fe39395c..5d4112e4a5e4 100644 --- a/src/test/compile-fail/trait-alias.rs +++ b/src/test/compile-fail/trait-alias.rs @@ -9,9 +9,11 @@ // except according to those terms. trait Alias1 = Default where T: Clone; // ok + //~^ERROR trait aliases are not yet implemented trait Alias2 = Default; //~^ERROR type parameters on the left side of a trait alias cannot be bounded //~^^ERROR type parameters on the left side of a trait alias cannot have defaults + //~^^^ERROR trait aliases are not yet implemented impl Alias1 { //~ERROR expected type, found trait alias fn foo() {} diff --git a/src/test/run-pass/trait-alias.rs b/src/test/ui/trait-alias.rs similarity index 76% rename from src/test/run-pass/trait-alias.rs rename to src/test/ui/trait-alias.rs index 529765320a29..b794bab84704 100644 --- a/src/test/run-pass/trait-alias.rs +++ b/src/test/ui/trait-alias.rs @@ -8,9 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -trait SimpleAlias = Default; -trait GenericAlias = Iterator; -trait Partial = IntoIterator; +trait SimpleAlias = Default; //~ERROR E0645 +trait GenericAlias = Iterator; //~ERROR E0645 +trait Partial = IntoIterator; //~ERROR E0645 trait Things {} trait Romeo {} @@ -19,10 +19,10 @@ struct Fore(T); impl Things for The {} impl Romeo for Fore {} -trait WithWhere = Romeo + Romeo where Fore<(Art, Thou)>: Romeo; -trait BareWhere = where The: Things; +trait WithWhere = Romeo + Romeo where Fore<(Art, Thou)>: Romeo; //~ERROR E0645 +trait BareWhere = where The: Things; //~ERROR E0645 -trait CD = Clone + Default; +trait CD = Clone + Default; //~ERROR E0645 fn foo() -> (T, T) { let one = T::default(); diff --git a/src/test/ui/trait-alias.stderr b/src/test/ui/trait-alias.stderr new file mode 100644 index 000000000000..4a8de37a3935 --- /dev/null +++ b/src/test/ui/trait-alias.stderr @@ -0,0 +1,38 @@ +error[E0645]: trait aliases are not yet implemented (see issue #41517) + --> $DIR/trait-alias.rs:11:1 + | +11 | trait SimpleAlias = Default; //~ERROR E0645 + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +error[E0645]: trait aliases are not yet implemented (see issue #41517) + --> $DIR/trait-alias.rs:12:1 + | +12 | trait GenericAlias = Iterator; //~ERROR E0645 + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +error[E0645]: trait aliases are not yet implemented (see issue #41517) + --> $DIR/trait-alias.rs:13:1 + | +13 | trait Partial = IntoIterator; //~ERROR E0645 + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +error[E0645]: trait aliases are not yet implemented (see issue #41517) + --> $DIR/trait-alias.rs:22:1 + | +22 | trait WithWhere = Romeo + Romeo where Fore<(Art, Thou)>: Romeo; //~ERROR E0645 + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +error[E0645]: trait aliases are not yet implemented (see issue #41517) + --> $DIR/trait-alias.rs:23:1 + | +23 | trait BareWhere = where The: Things; //~ERROR E0645 + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +error[E0645]: trait aliases are not yet implemented (see issue #41517) + --> $DIR/trait-alias.rs:25:1 + | +25 | trait CD = Clone + Default; //~ERROR E0645 + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +error: aborting due to 6 previous errors +