From f6eb09bf632bd3773969ef53e54572f9dd523046 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 3 Apr 2019 22:13:12 +0200 Subject: [PATCH] Fix explicit_predicates_of --- src/librustc_typeck/collect.rs | 7 +------ src/test/rustdoc/useless_lifetime_bound.rs | 2 +- 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 +}