Skip to content
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

fix(resolve): only disambiguate binding key during define #110493

Merged
merged 1 commit into from
May 18, 2023

Conversation

bvanjoi
Copy link
Contributor

@bvanjoi bvanjoi commented Apr 18, 2023

@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. labels Apr 18, 2023
@bvanjoi bvanjoi force-pushed the new_disambiguated_key branch from eade9bb to 2983f2f Compare April 18, 2023 13:47
@petrochenkov
Copy link
Contributor

Thanks!
r=me after cleaning up formatting (#110493 (comment)).
@rustbot author

@petrochenkov petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 18, 2023
@bvanjoi bvanjoi force-pushed the new_disambiguated_key branch from 2983f2f to d8f9c06 Compare April 18, 2023 14:56
@petrochenkov
Copy link
Contributor

@bors r+

@bvanjoi bvanjoi force-pushed the new_disambiguated_key branch from d8f9c06 to f89f66e Compare April 18, 2023 15:00
@bors
Copy link
Contributor

bors commented Apr 18, 2023

📌 Commit 2983f2f4a8a2bd56be514105096fe90ace5fa93d has been approved by petrochenkov

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 18, 2023
@bvanjoi
Copy link
Contributor Author

bvanjoi commented Apr 19, 2023

It may be necessary to approve again, probably because the subsequent push --force has left the queue in an unapproved state @petrochenkov

@bors
Copy link
Contributor

bors commented Apr 26, 2023

☔ The latest upstream changes (presumably #110852) 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 Apr 26, 2023
@bvanjoi bvanjoi force-pushed the new_disambiguated_key branch from f89f66e to 5b09810 Compare May 18, 2023 01:30
@bvanjoi
Copy link
Contributor Author

bvanjoi commented May 18, 2023

Clearing git conflicts completed, @rustbot ready

@rustbot rustbot 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 May 18, 2023
@wesleywiser
Copy link
Member

Manually reviewed the diffs and the code changes are the same as when @petrochenkov originally reviewed modulo fixes to use statements during rebase.

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented May 18, 2023

📌 Commit 5b09810 has been approved by petrochenkov

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 May 18, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 18, 2023
…etrochenkov

fix(resolve): only disambiguate binding key during define

- close rust-lang#110164
- discussion: rust-lang#110264 (comment)

r? `@petrochenkov`
@bors
Copy link
Contributor

bors commented May 18, 2023

⌛ Testing commit 5b09810 with merge d3f416d...

@bors
Copy link
Contributor

bors commented May 18, 2023

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing d3f416d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 18, 2023
@bors bors merged commit d3f416d into rust-lang:master May 18, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 18, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (d3f416d): 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.3% [0.3%, 0.3%] 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)
1.5% [1.5%, 1.5%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

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)
1.4% [1.4%, 1.4%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 641s -> 640.647s (-0.06%)

@bvanjoi bvanjoi deleted the new_disambiguated_key branch May 20, 2023 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ICE: stack overflow in resolver
6 participants