Skip to content

Conversation

@tmiasko
Copy link
Contributor

@tmiasko tmiasko commented Oct 12, 2021

The merging code does not expect to see any duplicates.

Fixes #89820.

r? @cjgillot

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 12, 2021
@cjgillot
Copy link
Contributor

This code definitely needs a bit more testing. Could you add some regression test?
r=me either way

@tmiasko tmiasko force-pushed the overflap-duplicates branch from 1ec6a73 to 8aaf4ab Compare October 12, 2021 23:02
The merging code does not expect to see any duplicates.
@Mark-Simulacrum
Copy link
Member

@bors r=cjgillot p=1

@bors
Copy link
Collaborator

bors commented Oct 13, 2021

📌 Commit 8aaf4ab has been approved by cjgillot

@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 13, 2021
@bors
Copy link
Collaborator

bors commented Oct 13, 2021

⌛ Testing commit 8aaf4ab with merge eeb16a2...

@bors
Copy link
Collaborator

bors commented Oct 13, 2021

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing eeb16a2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 13, 2021
@bors bors merged commit eeb16a2 into rust-lang:master Oct 13, 2021
@rustbot rustbot added this to the 1.57.0 milestone Oct 13, 2021
@tmiasko tmiasko deleted the overflap-duplicates branch October 13, 2021 19:45
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (eeb16a2): comparison url.

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

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

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.

regression: inherent impls overlap check

7 participants