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

Jump to bottom
Merged
merged 5 commits into from
Nov 27, 2022
Merged

Separate lifetime ident from lifetime resolution in HIR #104048

merged 5 commits into from
Nov 27, 2022

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Nov 6, 2022

Drive-by: change how suggested generic args are computed.
Fixes #103815

I recommend reviewing commit-by-commit.

@rustbot
Copy link
Collaborator

rustbot commented Nov 6, 2022

r? @compiler-errors

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Nov 6, 2022
@rustbot
Copy link
Collaborator

rustbot commented Nov 6, 2022

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented Nov 7, 2022

☔ The latest upstream changes (presumably #104083) made this pull request unmergeable. Please resolve the merge conflicts.

@cjgillot cjgillot mentioned this pull request Nov 7, 2022
Closed
@bors
Copy link
Collaborator

bors commented Nov 12, 2022

☔ The latest upstream changes (presumably #103530) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Collaborator

bors commented Nov 13, 2022

☔ The latest upstream changes (presumably #104282) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Collaborator

bors commented Nov 17, 2022

☔ The latest upstream changes (presumably #104170) made this pull request unmergeable. Please resolve the merge conflicts.

@compiler-errors
Copy link
Member

compiler-errors commented Nov 22, 2022 •
edited
Loading

This is a pretty big PR to fix one issue 😆 , but I understand this is a lot of other subtle clean-ups as well. (edit: Actually the issue fix was just a drive-by!)

Anyways, I think I've convinced myself that this is correct.

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 22, 2022

📌 Commit fd932ddbcd2e78fa9245b28f6028ef8a31630c05 has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 22, 2022
@bors
Copy link
Collaborator

bors commented Nov 22, 2022

☔ The latest upstream changes (presumably #104688) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 22, 2022
@bors
Copy link
Collaborator

bors commented Nov 23, 2022

☔ The latest upstream changes (presumably #104776) made this pull request unmergeable. Please resolve the merge conflicts.

@cjgillot cjgillot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 26, 2022
@cjgillot
Copy link
Contributor Author

simple rebase
@bors r=compiler-errors

@bors
Copy link
Collaborator

bors commented Nov 26, 2022

📌 Commit 5de9c84 has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 26, 2022
@bors
Copy link
Collaborator

bors commented Nov 27, 2022

⌛ Testing commit 5de9c84 with merge 454784a...

@bors
Copy link
Collaborator

bors commented Nov 27, 2022

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 454784a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 27, 2022
@bors bors merged commit 454784a into rust-lang:master Nov 27, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 27, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (454784a): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 0.2% [0.2%, 0.2%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.2% [-2.2%, -2.2%] 1
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

@cjgillot cjgillot deleted the split-lifetime branch November 29, 2022 18:43
flip1995 pushed a commit to flip1995/rust that referenced this pull request Dec 1, 2022
@bors
Auto merge of rust-lang#104048 - cjgillot:split-lifetime, r=compiler-…
696ea06 
…errors

Separate lifetime ident from lifetime resolution in HIR

Drive-by: change how suggested generic args are computed.
Fixes rust-lang#103815

I recommend reviewing commit-by-commit.
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jan 1, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@compiler-errors compiler-errors

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.67.0
Development

Successfully merging this pull request may close these issues.

GAT in path suggests wrong lifetime name when elided lifetime is rejected
6 participants
@cjgillot @rustbot @rust-log-analyzer @bors @compiler-errors @rust-timer