Fix rustc_pass_by_value.

cjgillot · cjgillot · commit 5de9c841402d · 2022-11-24T17:49:42.000Z
diff --git a/compiler/rustc_hir/src/hir.rs b/compiler/rustc_hir/src/hir.rs
@@ -132,7 +132,7 @@ impl LifetimeName {
 
 impl fmt::Display for Lifetime {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.ident.fmt(f)
+        if self.ident.name != kw::Empty { self.ident.name.fmt(f) } else { "'_".fmt(f) }
     }
 }
 
diff --git a/compiler/rustc_lint/src/pass_by_value.rs b/compiler/rustc_lint/src/pass_by_value.rs
@@ -78,7 +78,7 @@ fn gen_args(cx: &LateContext<'_>, segment: &PathSegment<'_>) -> String {
             .args
             .iter()
             .map(|arg| match arg {
-                GenericArg::Lifetime(lt) => lt.ident.to_string(),
+                GenericArg::Lifetime(lt) => lt.to_string(),
                 GenericArg::Type(ty) => {
                     cx.tcx.sess.source_map().span_to_snippet(ty.span).unwrap_or_else(|_| "_".into())
                 }

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ impl LifetimeName {`
`132`	`132`
`133`	`133`	`impl fmt::Display for Lifetime {`
`134`	`134`	`fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {`
`135`		`- self.ident.fmt(f)`
	`135`	`+ if self.ident.name != kw::Empty { self.ident.name.fmt(f) } else { "'_".fmt(f) }`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ fn gen_args(cx: &LateContext<'_>, segment: &PathSegment<'_>) -> String {`
`78`	`78`	`.args`
`79`	`79`	`.iter()`
`80`	`80`	`.map(\|arg\| match arg {`
`81`		`- GenericArg::Lifetime(lt) => lt.ident.to_string(),`
	`81`	`+ GenericArg::Lifetime(lt) => lt.to_string(),`
`82`	`82`	`GenericArg::Type(ty) => {`
`83`	`83`	`cx.tcx.sess.source_map().span_to_snippet(ty.span).unwrap_or_else(\|_\| "_".into())`
`84`	`84`	`}`