about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2019-04-03 22:13:12 +0200
committerGuillaume Gomez <guillaume1.gomez@gmail.com>2019-04-03 22:13:12 +0200
commitf6eb09bf632bd3773969ef53e54572f9dd523046 (patch)
treef121828bd176cf876dbbb3c2390549f48e765644 /src
parentddd034aa6f04e7f452bca398e3982c4a5ef6c0bc (diff)
downloadrust-f6eb09bf632bd3773969ef53e54572f9dd523046.tar.gz
rust-f6eb09bf632bd3773969ef53e54572f9dd523046.zip
Fix explicit_predicates_of
Diffstat (limited to 'src')
-rw-r--r--src/librustc_typeck/collect.rs7
-rw-r--r--src/test/rustdoc/useless_lifetime_bound.rs2
2 files changed, 2 insertions, 7 deletions
diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs
index b94b5f82062..7d4439233da 100644
--- a/src/librustc_typeck/collect.rs
+++ b/src/librustc_typeck/collect.rs
@@ -1920,12 +1920,7 @@ fn explicit_predicates_of<'a, 'tcx>(
 
     let hir_id = match tcx.hir().as_local_hir_id(def_id) {
         Some(hir_id) => hir_id,
-        None => {
-            return Lrc::new(ty::GenericPredicates {
-                parent: None,
-                predicates: Vec::new(),
-            })
-        }
+        None => return tcx.predicates_of(def_id),
     };
     let node = tcx.hir().get_by_hir_id(hir_id);
 
diff --git a/src/test/rustdoc/useless_lifetime_bound.rs b/src/test/rustdoc/useless_lifetime_bound.rs
index d40456dbcf1..5628b60e77d 100644
--- a/src/test/rustdoc/useless_lifetime_bound.rs
+++ b/src/test/rustdoc/useless_lifetime_bound.rs
@@ -4,4 +4,4 @@ use std::marker::PhantomData;
 // @!has - '//*[@class="rust struct"]' "'env: 'env"
 pub struct Scope<'env> {
     _marker: PhantomData<&'env mut &'env ()>,
-}
\ No newline at end of file
+}