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

Silence some follow-up errors on trait impls in case the trait has conflicting or otherwise incoherent impls #123674

Merged
merged 2 commits into from
Apr 17, 2024

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Apr 9, 2024

fixes #123292

Also removes a bunch of extra diagnostics that were introduced in #121154 and #120558

@rustbot
Copy link
Collaborator

rustbot commented Apr 9, 2024

r? @estebank

rustbot has assigned @estebank.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 9, 2024
@oli-obk
Copy link
Contributor Author

oli-obk commented Apr 9, 2024

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 9, 2024
@bors
Copy link
Contributor

bors commented Apr 9, 2024

⌛ Trying commit c0a9c8c with merge f78ee34...

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 9, 2024
Silence some follow-up errors on trait impls in case the trait has conflicting or otherwise incoherent impls

fixes rust-lang#123292

Also removes a bunch of extra diagnostics that were introduced in rust-lang#121154 and rust-lang#120558
@bors
Copy link
Contributor

bors commented Apr 9, 2024

☀️ Try build successful - checks-actions
Build commit: f78ee34 (f78ee3493e18d9629e211c9eda272ade79bfa4bb)

@rust-timer

This comment has been minimized.

Copy link
Member

@compiler-errors compiler-errors 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 if perf is fine

@compiler-errors
Copy link
Member

@rustbot author

@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 Apr 9, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (f78ee34): comparison URL.

Overall result: ❌ regressions - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -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.6% [0.6%, 0.6%] 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)
- - 0
Improvements ✅
(primary)
-3.1% [-3.1%, -3.1%] 1
Improvements ✅
(secondary)
-3.7% [-5.2%, -2.3%] 2
All ❌✅ (primary) -3.1% [-3.1%, -3.1%] 1

Cycles

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

Binary size

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

Bootstrap: 672.151s -> 675.22s (0.46%)
Artifact size: 318.39 MiB -> 318.39 MiB (0.00%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 9, 2024
@estebank
Copy link
Contributor

estebank commented Apr 9, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Apr 9, 2024

📌 Commit c0a9c8c has been approved by estebank

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 9, 2024
@bors
Copy link
Contributor

bors commented Apr 10, 2024

⌛ Testing commit c0a9c8c with merge 5a51958...

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 10, 2024
Silence some follow-up errors on trait impls in case the trait has conflicting or otherwise incoherent impls

fixes rust-lang#123292

Also removes a bunch of extra diagnostics that were introduced in rust-lang#121154 and rust-lang#120558
@bors
Copy link
Contributor

bors commented Apr 17, 2024

⌛ Testing commit c0a9c8c with merge 00ed4ed...

@bors
Copy link
Contributor

bors commented Apr 17, 2024

☀️ Test successful - checks-actions
Approved by: estebank
Pushing 00ed4ed to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 17, 2024
@bors bors merged commit 00ed4ed into rust-lang:master Apr 17, 2024
12 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 17, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (00ed4ed): comparison URL.

Overall result: ✅ improvements - 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
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.5% [-0.9%, -0.4%] 7
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)
- - 0
Improvements ✅
(primary)
-1.2% [-1.2%, -1.2%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.2% [-1.2%, -1.2%] 1

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)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.5% [-2.7%, -2.2%] 2
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 679.119s -> 677.217s (-0.28%)
Artifact size: 316.14 MiB -> 316.08 MiB (-0.02%)

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.

bad diagnostic for trait impl requirement
6 participants