From ddd034aa6f04e7f452bca398e3982c4a5ef6c0bc Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 31 Mar 2019 15:32:25 +0200 Subject: Fix invalid bounds string generation in rustdoc --- src/test/rustdoc/useless_lifetime_bound.rs | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/test/rustdoc/useless_lifetime_bound.rs (limited to 'src/test') diff --git a/src/test/rustdoc/useless_lifetime_bound.rs b/src/test/rustdoc/useless_lifetime_bound.rs new file mode 100644 index 00000000000..d40456dbcf1 --- /dev/null +++ b/src/test/rustdoc/useless_lifetime_bound.rs @@ -0,0 +1,7 @@ +use std::marker::PhantomData; + +// @has useless_lifetime_bound/struct.Scope.html +// @!has - '//*[@class="rust struct"]' "'env: 'env" +pub struct Scope<'env> { + _marker: PhantomData<&'env mut &'env ()>, +} \ No newline at end of file -- cgit 1.4.1-3-g733a5 From f6eb09bf632bd3773969ef53e54572f9dd523046 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 3 Apr 2019 22:13:12 +0200 Subject: 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(-) (limited to 'src/test') 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 +} -- cgit 1.4.1-3-g733a5 From c966c458975cc6987f83440206bdedd3cab298b6 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 3 Apr 2019 22:18:41 +0200 Subject: Add test from #59033 --- src/test/rustdoc/useless_lifetime_bound.rs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/test') diff --git a/src/test/rustdoc/useless_lifetime_bound.rs b/src/test/rustdoc/useless_lifetime_bound.rs index 5628b60e77d..f530d8a654f 100644 --- a/src/test/rustdoc/useless_lifetime_bound.rs +++ b/src/test/rustdoc/useless_lifetime_bound.rs @@ -5,3 +5,9 @@ use std::marker::PhantomData; pub struct Scope<'env> { _marker: PhantomData<&'env mut &'env ()>, } + +// @has useless_lifetime_bound/struct.Scope.html +// @!has - '//*[@class="rust struct"]' "T: 'a + 'a" +pub struct SomeStruct<'a, T: 'a> { + _marker: PhantomData<&'a T>, +} -- cgit 1.4.1-3-g733a5