Fixing tests from anon -> opaque

diff --git a/src/librustc_mir/transform/qualify_min_const_fn.rs b/src/librustc_mir/transform/qualify_min_const_fn.rs
index 56e32ea5d1a23b3eb71ab6c147e182fb1370b856..eacc23c9c4fe22cdfa69c9e953db7793f1959f45 100644 (file)
--- a/src/librustc_mir/transform/qualify_min_const_fn.rs
+++ b/src/librustc_mir/transform/qualify_min_const_fn.rs
@@ -100,7 +100,7 @@ fn check_ty(
                 span,
                 "mutable references in const fn are unstable".into(),
             )),
-            ty::Anon(..) => return Err((span, "`impl Trait` in const fn is unstable".into())),
+            ty::Opaque(..) => return Err((span, "`impl Trait` in const fn is unstable".into())),
             ty::FnPtr(..) => {
                 return Err((span, "function pointers in const fn are unstable".into()))
             }

diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs
index 2a01ac555ae5c3757305d6cf0397136e0075c9f1..702af3d221b8300b00f3f0c3490cb63d9664341c 100644 (file)
--- a/src/librustc_typeck/collect.rs
+++ b/src/librustc_typeck/collect.rs
@@ -1646,21 +1646,13 @@ fn explicit_predicates_of<'a, 'tcx>(
                 let opaque_ty = tcx.mk_opaque(def_id, substs);
 
                 // Collect the bounds, i.e. the `A+B+'c` in `impl A+B+'c`.
-<<<<<<< HEAD
                 let bounds = compute_bounds(
                     &icx,
-                    anon_ty,
+                    opaque_ty,
                     bounds,
                     SizedByDefault::Yes,
                     tcx.def_span(def_id),
                 );
-=======
-                let bounds = compute_bounds(&icx,
-                                            opaque_ty,
-                                            bounds,
-                                            SizedByDefault::Yes,
-                                            tcx.def_span(def_id));
->>>>>>> ca386bc20a... Changing TyAnon -> TyOpaque and relevant functions
 
                 predicates.extend(bounds.predicates(tcx, opaque_ty));
                 &item.generics

diff --git a/src/librustc_typeck/constrained_type_params.rs b/src/librustc_typeck/constrained_type_params.rs
index 07f6fa5e8ad131242bce7ab4a0b2fa9dd4839148..1b481fc5a7d3174d9b0db5c25800a44d72502c9c 100644 (file)
--- a/src/librustc_typeck/constrained_type_params.rs
+++ b/src/librustc_typeck/constrained_type_params.rs
@@ -1,4 +1,4 @@
-//n Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //

diff --git a/src/test/ui/existential_types/generic_type_does_not_live_long_enough.nll.stderr b/src/test/ui/existential_types/generic_type_does_not_live_long_enough.nll.stderr
index a480f54ac187385f7088bea0aab1134f752d97f9..471eda45dafdc950430c222e3694f0a3510b5f66 100644 (file)
--- a/src/test/ui/existential_types/generic_type_does_not_live_long_enough.nll.stderr
+++ b/src/test/ui/existential_types/generic_type_does_not_live_long_enough.nll.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/generic_type_does_not_live_long_enough.rs:16:18
    |
 LL |     let z: i32 = x; //~ ERROR mismatched types
-   |                  ^ expected i32, found anonymized type
+   |                  ^ expected i32, found opaque type
    |
    = note: expected type `i32`
               found type `WrongGeneric::<&{integer}>`

diff --git a/src/test/ui/existential_types/generic_type_does_not_live_long_enough.stderr b/src/test/ui/existential_types/generic_type_does_not_live_long_enough.stderr
index 189ad7d49a485d8f84f2e4f111924c429598efce..f1773b7c2fc8fa953197ab417877f49fcd3177e4 100644 (file)
--- a/src/test/ui/existential_types/generic_type_does_not_live_long_enough.stderr
+++ b/src/test/ui/existential_types/generic_type_does_not_live_long_enough.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/generic_type_does_not_live_long_enough.rs:16:18
    |
 LL |     let z: i32 = x; //~ ERROR mismatched types
-   |                  ^ expected i32, found anonymized type
+   |                  ^ expected i32, found opaque type
    |
    = note: expected type `i32`
               found type `WrongGeneric::<&{integer}>`

diff --git a/src/test/ui/existential_types/never_reveal_concrete_type.stderr b/src/test/ui/existential_types/never_reveal_concrete_type.stderr
index 449799c91b79ae0273f5796135231baf82655912..ab937a9483c0c88d412daded809d6f4324208dee 100644 (file)
--- a/src/test/ui/existential_types/never_reveal_concrete_type.stderr
+++ b/src/test/ui/existential_types/never_reveal_concrete_type.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/never_reveal_concrete_type.rs:24:27
    |
 LL |     let _: &'static str = x; //~ mismatched types
-   |                           ^ expected reference, found anonymized type
+   |                           ^ expected reference, found opaque type
    |
    = note: expected type `&'static str`
               found type `NoReveal`

diff --git a/src/test/ui/existential_types/no_revealing_outside_defining_module.stderr b/src/test/ui/existential_types/no_revealing_outside_defining_module.stderr
index a1c98c6d4b89ea9279f5ed6df05e8786ff6dfa1f..3f03174a4917b988c2f26c5f53bf4553ab64e6b5 100644 (file)
--- a/src/test/ui/existential_types/no_revealing_outside_defining_module.stderr
+++ b/src/test/ui/existential_types/no_revealing_outside_defining_module.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/no_revealing_outside_defining_module.rs:26:19
    |
 LL |     let _: &str = bomp(); //~ ERROR mismatched types
-   |                   ^^^^^^ expected &str, found anonymized type
+   |                   ^^^^^^ expected &str, found opaque type
    |
    = note: expected type `&str`
               found type `Boo`
@@ -13,7 +13,7 @@ error[E0308]: mismatched types
 LL | fn bomp() -> boo::Boo {
    |              -------- expected `Boo` because of return type
 LL |     "" //~ ERROR mismatched types
-   |     ^^ expected anonymized type, found reference
+   |     ^^ expected opaque type, found reference
    |
    = note: expected type `Boo`
               found type `&'static str`

diff --git a/src/test/ui/impl-trait/equality2.rs b/src/test/ui/impl-trait/equality2.rs
index ec3dc15d8464e82519c391c5a8bb7b821745818b..2ce24cf789dd37d4653d2baf058087bbdf8e7064 100644 (file)
--- a/src/test/ui/impl-trait/equality2.rs
+++ b/src/test/ui/impl-trait/equality2.rs
@@ -36,7 +36,7 @@ fn main() {
     //~^ ERROR mismatched types
     //~| expected type `u32`
     //~| found type `impl Foo`
-    //~| expected u32, found anonymized type
+    //~| expected u32, found opaque type
 
     let _: i32 = Leak::leak(hide(0_i32));
     //~^ ERROR mismatched types

diff --git a/src/test/ui/impl-trait/equality2.stderr b/src/test/ui/impl-trait/equality2.stderr
index e4ff2f68247834e92e5baee1f264959590c9de8e..da51e35947a3b07562cec646fa7f5f550d4f981a 100644 (file)
--- a/src/test/ui/impl-trait/equality2.stderr
+++ b/src/test/ui/impl-trait/equality2.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/equality2.rs:35:18
    |
 LL |     let _: u32 = hide(0_u32);
-   |                  ^^^^^^^^^^^ expected u32, found anonymized type
+   |                  ^^^^^^^^^^^ expected u32, found opaque type
    |
    = note: expected type `u32`
               found type `impl Foo`