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 def collector for impl trait #77546

Merged
merged 7 commits into from
Oct 25, 2020
Merged

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Oct 4, 2020

fixes #77329

We now consistently make impl Trait a hir owner, requiring some special casing for synthetic generic params.

r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 4, 2020
@eddyb
Copy link
Member

eddyb commented Oct 4, 2020

@bors r+ Thanks! (looks like this was an oversight)

@bors
Copy link
Contributor

bors commented Oct 4, 2020

📌 Commit 9347d140928743b2e2c8b2f9b60178d8a50336b7 has been approved by eddyb

@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 Oct 4, 2020
@lcnr
Copy link
Contributor Author

lcnr commented Oct 4, 2020

@bors r- I forgot to add the test case here

@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 Oct 4, 2020
@eddyb
Copy link
Member

eddyb commented Oct 4, 2020

@bors rollup=never (this is turning into something that may have sharp edge cases)

compiler/rustc_hir/src/hir.rs Outdated Show resolved Hide resolved
Copy link
Member

@eddyb eddyb left a comment

Choose a reason for hiding this comment

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

r=me modulo comments

@eddyb
Copy link
Member

eddyb commented Oct 5, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Oct 5, 2020

📌 Commit 23520c1c1ed5db78ab2910049b7f570e54757856 has been approved by eddyb

@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 Oct 5, 2020
@bors
Copy link
Contributor

bors commented Oct 5, 2020

⌛ Testing commit 23520c1c1ed5db78ab2910049b7f570e54757856 with merge 88dc9039ef9467cdbf88b436e1b0494554ab7f68...

@bors
Copy link
Contributor

bors commented Oct 5, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 5, 2020
@lcnr
Copy link
Contributor Author

lcnr commented Oct 5, 2020

I can't reproduce this locally :/

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 18, 2020
@bors
Copy link
Contributor

bors commented Oct 18, 2020

⌛ Testing commit 604bc87 with merge 8ac828f96b07437599fc1735bb97fc029b236ed7...

@bors
Copy link
Contributor

bors commented Oct 18, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 18, 2020
@pietroalbini
Copy link
Member

@bors r-

The PR failed but bors forgot about that during synchronize.

@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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 19, 2020
@eddyb
Copy link
Member

eddyb commented Oct 22, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Oct 22, 2020

📌 Commit 567d55e has been approved by eddyb

@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 Oct 22, 2020
@bors
Copy link
Contributor

bors commented Oct 24, 2020

⌛ Testing commit 567d55e with merge f0817e272619abf26c4a01b0fe3a116e564a92fe...

@bors
Copy link
Contributor

bors commented Oct 24, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 24, 2020
@lcnr
Copy link
Contributor Author

lcnr commented Oct 24, 2020

gzip: stdin: not in gzip format

okay, that looks spurious to me.

@bors retry

@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 Oct 24, 2020
@bors
Copy link
Contributor

bors commented Oct 25, 2020

⌛ Testing commit 567d55e with merge 3e0dd24...

@rust-log-analyzer
Copy link
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@bors
Copy link
Contributor

bors commented Oct 25, 2020

☀️ Test successful - checks-actions
Approved by: eddyb
Pushing 3e0dd24 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 25, 2020
@bors bors merged commit 3e0dd24 into rust-lang:master Oct 25, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 25, 2020
@lcnr lcnr deleted the impl-trait-closure branch October 25, 2020 16:29
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Stable ICE: assertion failed: (left == right)
7 participants