diff options
| author | Michael Howell <michael@notriddle.com> | 2022-07-04 22:19:53 -0700 |
|---|---|---|
| committer | Michael Howell <michael@notriddle.com> | 2022-07-04 22:21:38 -0700 |
| commit | 3ac1a9b50d95fd2665069c512d2b09b6edfc554f (patch) | |
| tree | 1397a513dc5909ba671b43d6a636b715404eebdb | |
| parent | 5b9775fe17893cba641a071de7e0a7c8f478c41b (diff) | |
| download | rust-3ac1a9b50d95fd2665069c512d2b09b6edfc554f.tar.gz rust-3ac1a9b50d95fd2665069c512d2b09b6edfc554f.zip | |
rustdoc: filter '_ lifetimes from ty::Generics
Fixes a weirdly-rendered section of the std::string::String docs.
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 1 | ||||
| -rw-r--r-- | src/test/rustdoc/auxiliary/issue-98697-reexport-with-anonymous-lifetime.rs | 8 | ||||
| -rw-r--r-- | src/test/rustdoc/issue-98697.rs | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 6ee725edcfc..4d33b7a376a 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -629,6 +629,7 @@ fn clean_ty_generics<'tcx>( .params .iter() .filter_map(|param| match param.kind { + ty::GenericParamDefKind::Lifetime if param.name == kw::UnderscoreLifetime => None, ty::GenericParamDefKind::Lifetime => Some(param.clean(cx)), ty::GenericParamDefKind::Type { synthetic, .. } => { if param.name == kw::SelfUpper { diff --git a/src/test/rustdoc/auxiliary/issue-98697-reexport-with-anonymous-lifetime.rs b/src/test/rustdoc/auxiliary/issue-98697-reexport-with-anonymous-lifetime.rs index 22cbeae7266..4e55e7ed576 100644 --- a/src/test/rustdoc/auxiliary/issue-98697-reexport-with-anonymous-lifetime.rs +++ b/src/test/rustdoc/auxiliary/issue-98697-reexport-with-anonymous-lifetime.rs @@ -7,3 +7,11 @@ where { unimplemented!() } + +pub struct Extra; + +pub trait MyTrait<T> { + fn run() {} +} + +impl MyTrait<&Extra> for Extra {} diff --git a/src/test/rustdoc/issue-98697.rs b/src/test/rustdoc/issue-98697.rs index 25ab55acd77..83e08094c09 100644 --- a/src/test/rustdoc/issue-98697.rs +++ b/src/test/rustdoc/issue-98697.rs @@ -11,3 +11,7 @@ extern crate issue_98697_reexport_with_anonymous_lifetime; // @has issue_98697/fn.repro.html '//pre[@class="rust fn"]/code' 'fn repro<F>() where F: Fn(&str)' // @!has issue_98697/fn.repro.html '//pre[@class="rust fn"]/code' 'for<' pub use issue_98697_reexport_with_anonymous_lifetime::repro; + +// @has issue_98697/struct.Extra.html '//div[@id="trait-implementations-list"]//h3[@class="code-header in-band"]' 'impl MyTrait<&Extra> for Extra' +// @!has issue_98697/struct.Extra.html '//div[@id="trait-implementations-list"]//h3[@class="code-header in-band"]' 'impl<' +pub use issue_98697_reexport_with_anonymous_lifetime::Extra; |