Skip to content

Rollup of 9 pull requests #98752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Jul 1, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1d845bd
fix `emit_inference_failure_err` ICE
lcnr Jun 28, 2022
c6f362a
Let rust-analyzer ship on stable, non-preview
cuviper Jun 28, 2022
ddb6313
add ice test for 46511
matthiaskrgr Jun 29, 2022
debee1e
Update RELEASES.md
tmiasko Jun 30, 2022
8931fbd
add logging to `write_resolution`
lcnr Jun 30, 2022
e043821
add issue number to fixme
lcnr Jun 30, 2022
c29e584
Flip RustAnalyzer to stable=true
cuviper Jun 30, 2022
cd7bd8b
rustdoc: filter '_ lifetimes from ty::PolyTraitRef
notriddle Jun 30, 2022
3fcf84a
clarify that ExactSizeIterator::len returns the remaining length
the8472 Jun 30, 2022
d791310
Request to be notified of MIR changes
celinval Jun 30, 2022
79f8dc0
Add a `--build-dir` flag to rustbuild
thomcc Jun 30, 2022
4ea18cc
Add macro_rules! rustdoc change to 1.62 relnotes
CAD97 Jul 1, 2022
0d5636c
Rollup merge of #98610 - lcnr:emit_inference_failure_err-ice, r=estebank
matthiaskrgr Jul 1, 2022
41e7991
Rollup merge of #98640 - cuviper:stable-rust-analyzer, r=Mark-Simulacrum
matthiaskrgr Jul 1, 2022
0420231
Rollup merge of #98686 - matthiaskrgr:test-46511, r=compiler-errors
matthiaskrgr Jul 1, 2022
e59693a
Rollup merge of #98727 - notriddle:notriddle/issue-98697, r=Guillaume…
matthiaskrgr Jul 1, 2022
734f21c
Rollup merge of #98729 - the8472:exactsize-docs, r=thomcc
matthiaskrgr Jul 1, 2022
80dd48b
Rollup merge of #98733 - celinval:patch-1, r=Mark-Simulacrum
matthiaskrgr Jul 1, 2022
c4acd06
Rollup merge of #98734 - tmiasko:uninhabited-calls-release-notes, r=M…
matthiaskrgr Jul 1, 2022
335e7d3
Rollup merge of #98745 - thomcc:build-dir-arg, r=jyn514
matthiaskrgr Jul 1, 2022
18d4228
Rollup merge of #98749 - CAD97:patch-3, r=jyn514
matthiaskrgr Jul 1, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rustdoc: filter '_ lifetimes from ty::PolyTraitRef
Fixes #98697
  • Loading branch information
notriddle committed Jun 30, 2022
commit cd7bd8bf0a4d22ed78ab0dd8217d940b41e7d542
2 changes: 1 addition & 1 deletion src/librustdoc/clean/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ fn clean_poly_trait_ref_with_bindings<'tcx>(
.collect_referenced_late_bound_regions(&poly_trait_ref)
.into_iter()
.filter_map(|br| match br {
ty::BrNamed(_, name) => Some(GenericParamDef {
ty::BrNamed(_, name) if name != kw::UnderscoreLifetime => Some(GenericParamDef {
name,
kind: GenericParamDefKind::Lifetime { outlives: vec![] },
}),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/// When reexporting this function, make sure the anonymous lifetimes are not rendered.
///
/// https://github.com/rust-lang/rust/issues/98697
pub fn repro<F>()
where
F: Fn(&str),
{
unimplemented!()
}
13 changes: 13 additions & 0 deletions src/test/rustdoc/issue-98697.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// aux-build:issue-98697-reexport-with-anonymous-lifetime.rs
// ignore-cross-compile

// When reexporting a function with a HRTB with anonymous lifetimes,
// make sure the anonymous lifetimes are not rendered.
//
// https://github.com/rust-lang/rust/issues/98697

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;