Skip to content

Fix negative overlap check regions#93652

Merged
bors merged 9 commits intorust-lang:masterfrom
spastorino:fix-negative-overlap-check-regions
Feb 14, 2022
Merged

Fix negative overlap check regions#93652
bors merged 9 commits intorust-lang:masterfrom
spastorino:fix-negative-overlap-check-regions

Conversation

@spastorino
Copy link
Copy Markdown
Member

@spastorino spastorino commented Feb 4, 2022 •
edited
Loading

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Feb 4, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 4, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@spastorino spastorino force-pushed the fix-negative-overlap-check-regions branch from 59cd5d0 to 570b6be Compare February 4, 2022 17:30
nikomatsakis
nikomatsakis requested changes Feb 5, 2022
View reviewed changes
nikomatsakis
nikomatsakis requested changes Feb 8, 2022
View reviewed changes
@spastorino spastorino force-pushed the fix-negative-overlap-check-regions branch from 570b6be to 1f08f20 Compare February 8, 2022 20:02
@spastorino
Copy link
Copy Markdown
Member Author

spastorino commented Feb 8, 2022 •
edited
Loading

@nikomatsakis have tried your suggestions but doesn't work. https://github.com/rust-lang/rust/blob/570b6bec43c55e62a2a5b67b134a6bbae051c698/compiler/rustc_infer/src/infer/outlives/obligations.rs#L179 returns None and then we hit ...

error: internal compiler error: no region-bound-pairs for HirId { owner: DefId(0:0 ~ coherence_overlap_with_regions[7775]), local_id: 0 }

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@nikomatsakis
Copy link
Copy Markdown
Contributor

nikomatsakis commented Feb 9, 2022

@rustbot author

@spastorino and I discussed how to proceed here and he is going to apply those changes.

@rustbot rustbot 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 Feb 9, 2022
@spastorino spastorino force-pushed the fix-negative-overlap-check-regions branch 2 times, most recently from c0ff661 to 0232de9 Compare February 9, 2022 22:39
@spastorino spastorino marked this pull request as ready for review February 10, 2022 02:44
nikomatsakis
nikomatsakis requested changes Feb 10, 2022
View reviewed changes
@spastorino spastorino force-pushed the fix-negative-overlap-check-regions branch from 9ca7909 to c10dbf7 Compare February 10, 2022 19:40
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@spastorino spastorino force-pushed the fix-negative-overlap-check-regions branch from c10dbf7 to d9e160e Compare February 10, 2022 20:14
@nikomatsakis nikomatsakis mentioned this pull request Feb 10, 2022
Closed
nikomatsakis
nikomatsakis requested changes Feb 10, 2022
View reviewed changes
@nikomatsakis
Copy link
Copy Markdown
Contributor

nikomatsakis commented Feb 10, 2022

@bors rollup=never r+

@bors
Copy link
Copy Markdown
Collaborator

bors commented Feb 10, 2022

📌 Commit a17311400f510903fa3c9f253c735243d5f0dc8a has been approved by nikomatsakis

@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 Feb 10, 2022
@bors
Copy link
Copy Markdown
Collaborator

bors commented Feb 11, 2022

☔ The latest upstream changes (presumably #93893) 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 Feb 11, 2022
@spastorino spastorino force-pushed the fix-negative-overlap-check-regions branch from a173114 to 3c7fa0b Compare February 14, 2022 16:11
@spastorino
Copy link
Copy Markdown
Member Author

spastorino commented Feb 14, 2022

@bors r=nikomatsakis

@bors
Copy link
Copy Markdown
Collaborator

bors commented Feb 14, 2022

📌 Commit 3c7fa0b has been approved by nikomatsakis

@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 Feb 14, 2022
@bors
Copy link
Copy Markdown
Collaborator

bors commented Feb 14, 2022

⌛ Testing commit 3c7fa0b with merge c5c610a...

@bors
Copy link
Copy Markdown
Collaborator

bors commented Feb 14, 2022

☀️ Test successful - checks-actions
Approved by: nikomatsakis
Pushing c5c610a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 14, 2022
@bors bors merged commit c5c610a into rust-lang:master Feb 14, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 14, 2022
@rust-timer
Copy link
Copy Markdown
Collaborator

rust-timer commented Feb 14, 2022

Finished benchmarking commit (c5c610a): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

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

Milestone

1.60.0

Development

Successfully merging this pull request may close these issues.

7 participants

@spastorino @rust-log-analyzer @nikomatsakis @bors @rust-timer @rust-highfive @rustbot