Skip to content

Separate lifetime ident from lifetime resolution in HIR #104048

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.

Sign up for GitHub

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
bors merged 5 commits into from
Nov 27, 2022
Merged

Separate lifetime ident from lifetime resolution in HIR #104048

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb7d25e
Separate lifetime ident from resolution in HIR.
cjgillot Nov 5, 2022
5f5e7a8
Record in HIR whether lifetime elision was succesful.
cjgillot Nov 6, 2022
4109034
Change how suggested lifetime args are computed.
cjgillot Nov 6, 2022
1c737d6
Use kw::Empty for elided lifetimes in path.
cjgillot Nov 6, 2022
5de9c84
Fix rustc_pass_by_value.
cjgillot Nov 6, 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
Fix rustc_pass_by_value.
  • Loading branch information
@cjgillot
cjgillot committed Nov 24, 2022
commit 5de9c841402d40ef30426b096c7696b1e01f2892
2 changes: 1 addition & 1 deletion compiler/rustc_hir/src/hir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
}
}

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_lint/src/pass_by_value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
Expand Down