Add tests for program_clauses_for_env

Author: scalexm

src/librustc_traits/lowering/environment.rs

@@ -231,14 +231,15 @@ crate fn environment<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> En
         input_tys.extend(trait_ref.self_ty().walk());
     }
 
-    // In an fn, we assume that the arguments and all their constitutents are
+    // In an fn, we assume that the arguments and all their constituents are
     // well-formed.
     if is_fn {
-        let fn_sig = tcx.fn_sig(def_id)
-            .no_late_bound_regions()
-            .expect("only early bound regions");
+        let fn_sig = tcx.fn_sig(def_id);
         input_tys.extend(
-            fn_sig.inputs().iter().flat_map(|ty| ty.walk())
+            // FIXME: `skip_binder` seems ok for now? In a real setting,
+            // the late bound regions would next be instantiated with things
+            // in the inference table.
+            fn_sig.skip_binder().inputs().iter().flat_map(|ty| ty.walk())
         );
     }
 

src/test/ui/chalkify/lower_env1.stderr

@@ -18,9 +18,6 @@ LL | #[rustc_dump_env_program_clauses] //~ ERROR program clause dump
    = note: Implemented(Self: Bar) :- FromEnv(Self: Bar).
    = note: Implemented(Self: Foo) :- FromEnv(Self: Foo).
    = note: Implemented(Self: std::marker::Sized) :- FromEnv(Self: std::marker::Sized).
-   = note: WellFormed(Self: Bar) :- Implemented(Self: Bar), WellFormed(Self: Foo).
-   = note: WellFormed(Self: Foo) :- Implemented(Self: Foo).
-   = note: WellFormed(Self: std::marker::Sized) :- Implemented(Self: std::marker::Sized).
 
 error: aborting due to 2 previous errors
 

src/test/ui/chalkify/lower_env2.rs

@@ -0,0 +1,26 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(rustc_attrs)]
+#![allow(dead_code)]
+
+trait Foo { }
+
+#[rustc_dump_program_clauses] //~ ERROR program clause dump
+struct S<'a, T> where T: Foo {
+    data: &'a T,
+}
+
+#[rustc_dump_env_program_clauses] //~ ERROR program clause dump
+fn bar<'a, T: Foo>(x: S<T>) {
+}
+
+fn main() {
+}

src/test/ui/chalkify/lower_env2.stderr

@@ -0,0 +1,25 @@
+error: program clause dump
+  --> $DIR/lower_env2.rs:16:1
+   |
+LL | #[rustc_dump_program_clauses] //~ ERROR program clause dump
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: FromEnv(T: Foo) :- FromEnv(S<'a, T>).
+   = note: FromEnv(T: std::marker::Sized) :- FromEnv(S<'a, T>).
+   = note: TypeOutlives(T : 'a) :- FromEnv(S<'a, T>).
+   = note: WellFormed(S<'a, T>) :- Implemented(T: std::marker::Sized), Implemented(T: Foo), TypeOutlives(T : 'a).
+
+error: program clause dump
+  --> $DIR/lower_env2.rs:21:1
+   |
+LL | #[rustc_dump_env_program_clauses] //~ ERROR program clause dump
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: FromEnv(T: Foo) :- FromEnv(S<'a, T>).
+   = note: FromEnv(T: std::marker::Sized) :- FromEnv(S<'a, T>).
+   = note: Implemented(Self: Foo) :- FromEnv(Self: Foo).
+   = note: Implemented(Self: std::marker::Sized) :- FromEnv(Self: std::marker::Sized).
+   = note: TypeOutlives(T : 'a) :- FromEnv(S<'a, T>).
+
+error: aborting due to 2 previous errors
+

src/test/ui/chalkify/lower_env3.rs

@@ -0,0 +1,26 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(rustc_attrs)]
+#![allow(dead_code)]
+
+trait Foo {
+    #[rustc_dump_env_program_clauses] //~ ERROR program clause dump
+    fn foo(&self);
+}
+
+impl<T> Foo for T where T: Clone {
+    #[rustc_dump_env_program_clauses] //~ ERROR program clause dump
+    fn foo(&self) {
+    }
+}
+
+fn main() {
+}

src/test/ui/chalkify/lower_env3.stderr

@@ -0,0 +1,20 @@
+error: program clause dump
+  --> $DIR/lower_env3.rs:15:5
+   |
+LL |     #[rustc_dump_env_program_clauses] //~ ERROR program clause dump
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: Implemented(Self: Foo) :- FromEnv(Self: Foo).
+
+error: program clause dump
+  --> $DIR/lower_env3.rs:20:5
+   |
+LL |     #[rustc_dump_env_program_clauses] //~ ERROR program clause dump
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: FromEnv(Self: std::marker::Sized) :- FromEnv(Self: std::clone::Clone).
+   = note: Implemented(Self: std::clone::Clone) :- FromEnv(Self: std::clone::Clone).
+   = note: Implemented(Self: std::marker::Sized) :- FromEnv(Self: std::marker::Sized).
+
+error: aborting due to 2 previous errors
+