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.

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

Don't duplicate region names for late-bound regions in print of Binder #101996

Merged
merged 3 commits into from
Sep 26, 2022
Merged

Don't duplicate region names for late-bound regions in print of Binder #101996

merged 3 commits into from
Sep 26, 2022

Conversation

b-naber
Copy link
Contributor

@b-naber b-naber commented Sep 18, 2022

Fixes #101280

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 18, 2022
@rust-highfive
Copy link
Collaborator

r? @lcnr

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 18, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@b-naber b-naber force-pushed the binder-print branch 2 times, most recently from b5bf673 to 9f94d08 Compare September 18, 2022 21:55
lcnr
lcnr reviewed Sep 19, 2022
View reviewed changes
Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some nits, then r=me

Cargo.lock Outdated Show resolved Hide resolved
compiler/rustc_middle/src/ty/print/pretty.rs Outdated Show resolved Hide resolved
compiler/rustc_middle/src/ty/sty.rs Outdated Show resolved Hide resolved
@lcnr lcnr 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 Sep 21, 2022
@rustbot
Copy link
Collaborator

rustbot commented Sep 21, 2022

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

@b-naber b-naber force-pushed the binder-print branch 2 times, most recently from 37c6599 to 953d88b Compare September 21, 2022 17:05
@lcnr
Copy link
Contributor

lcnr commented Sep 22, 2022

@bors r+ rollup 👍

@bors
Copy link
Contributor

bors commented Sep 22, 2022

📌 Commit 953d88b has been approved by lcnr

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 Sep 22, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 22, 2022
@matthiaskrgr
Rollup merge of rust-lang#101996 - b-naber:binder-print, r=lcnr
4e6d2d9 
Don't duplicate region names for late-bound regions in print of Binder

Fixes rust-lang#101280
@matthiaskrgr matthiaskrgr mentioned this pull request Sep 22, 2022
Closed
@matthiaskrgr
Copy link
Member

@bors r- need test update it seems
https://github.com/rust-lang/rust/actions/runs/3108219234/jobs/5037174841#step:25:1567

@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 Sep 22, 2022
@lcnr
Copy link
Contributor

lcnr commented Sep 23, 2022

yeah, have to rebase and rebless ui-tests as a new affected test was added since you've forked master afaict

@lcnr
Copy link
Contributor

lcnr commented Sep 23, 2022

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 23, 2022

📌 Commit 82a90f7e5840c01e9d758cc5407aca9f9c8878df has been approved by lcnr

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 Sep 23, 2022
@bors
Copy link
Contributor

bors commented Sep 24, 2022

☔ The latest upstream changes (presumably #102068) 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 Sep 24, 2022
@lcnr
Copy link
Contributor

lcnr commented Sep 26, 2022

@bors delegate+

@bors
Copy link
Contributor

bors commented Sep 26, 2022

✌️ @b-naber can now approve this pull request

@b-naber
Copy link
Contributor Author

b-naber commented Sep 26, 2022

@bors r=lcnr rollup

@bors
Copy link
Contributor

bors commented Sep 26, 2022

📌 Commit 6118ee3 has been approved by lcnr

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 Sep 26, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Sep 26, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 26, 2022
@bors
Auto merge of rust-lang#102324 - matthiaskrgr:rollup-6l70oz3, r=matth…
8b70583 
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#101875 (Allow more `!Copy` impls)
 - rust-lang#101996 (Don't duplicate region names for late-bound regions in print of Binder)
 - rust-lang#102181 (Add regression test)
 - rust-lang#102273 (Allow `~const` bounds on non-const functions)
 - rust-lang#102286 (Recover some items that expect braces and don't take semicolons)

Failed merges:

 - rust-lang#102314 (Add a label to struct/enum/union ident name)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b02062e into rust-lang:master Sep 26, 2022
@rustbot rustbot added this to the 1.66.0 milestone Sep 26, 2022
This was referenced Sep 27, 2022
Open
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcnr lcnr lcnr left review comments

@cjgillot cjgillot cjgillot left review comments

Assignees

@lcnr lcnr

Labels
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
Milestone
1.66.0
Development

Successfully merging this pull request may close these issues.

Stand-in lifetime names for printing HRTs doesn’t avoid name collisions.
8 participants
@b-naber @rust-highfive @rust-log-analyzer @rustbot @lcnr @bors @matthiaskrgr @cjgillot