1
Fork 0

Rollup merge of #103080 - ohno418:fix-hir-pretty-print-lifetimes, r=cjgillot

pretty: fix to print some lifetimes on HIR pretty-print

HIR pretty-printer doesn't seem to print some lifetimes in types. This PR fixes that.

Closes https://github.com/rust-lang/rust/issues/85089
This commit is contained in:
Yuki Okushi 2022-10-16 11:41:13 +09:00 committed by GitHub
commit d08f4a6464
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 1 deletions

View file

@ -1687,7 +1687,11 @@ impl<'a> State<'a> {
let mut nonelided_generic_args: bool = false;
let elide_lifetimes = generic_args.args.iter().all(|arg| match arg {
GenericArg::Lifetime(lt) => lt.is_elided(),
GenericArg::Lifetime(lt) if lt.is_elided() => true,
GenericArg::Lifetime(_) => {
nonelided_generic_args = true;
false
}
_ => {
nonelided_generic_args = true;
true

View file

@ -0,0 +1,20 @@
#[prelude_import]
use ::std::prelude::rust_2015::*;
#[macro_use]
extern crate std;
// Test to print lifetimes on HIR pretty-printing.
// pretty-compare-only
// pretty-mode:hir
// pp-exact:issue-85089.pp
trait A<'x> { }
trait B<'x> { }
struct Foo<'b> {
bar: &'b dyn for<'a> A<'a>,
}
impl <'a> B<'a> for dyn for<'b> A<'b> { }
impl <'a> A<'a> for Foo<'a> { }

View file

@ -0,0 +1,16 @@
// Test to print lifetimes on HIR pretty-printing.
// pretty-compare-only
// pretty-mode:hir
// pp-exact:issue-85089.pp
trait A<'x> {}
trait B<'x> {}
struct Foo<'b> {
pub bar: &'b dyn for<'a> A<'a>,
}
impl<'a> B<'a> for dyn for<'b> A<'b> {}
impl<'a> A<'a> for Foo<'a> {}