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

Implement lint for obligations broken by never type fallback change #125289

Merged
merged 7 commits into from
Jun 13, 2024
Merged

Implement lint for obligations broken by never type fallback change #125289

merged 7 commits into from
Jun 13, 2024

Conversation

WaffleLapkin
Copy link
Member

@WaffleLapkin WaffleLapkin commented May 19, 2024 •
edited by traviscross
Loading

This is the second (and probably last major?) lint required for the never type fallback change.

The idea is to check if the code errors with fallback = () and if it errors with fallback = ! and if it went from "ok" to "error", lint.

I'm not happy with the diagnostic, ideally we'd highlight what bound is the problem. But I'm really unsure how to do that (cc @jackh726, iirc you had some ideas?)

r? @compiler-errors

Thanks @BoxyUwU with helping with trait solver stuff when I was implementing the initial version of this lint.

Tracking:

@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 May 19, 2024
@WaffleLapkin WaffleLapkin mentioned this pull request May 19, 2024
Closed
8 tasks
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@traviscross traviscross mentioned this pull request May 19, 2024
Merged
@jackh726
Copy link
Member

I'm not happy with the diagnostic, ideally we'd highlight what bound is the problem. But I'm really unsure how to do that

So, yeah, we talked about this. IIRC, what I said was basically like "we can't find diff two error sets" but as long as we only try to report ! fallback errors if () fallback errors are empty, that's probably fine...

We can chat on zulip about details here, but I would probably approach this by selecting a couple test cases where you want better diagnostics, then look at the errors that you get and what info is there, then figure out how to extract out that info. Then you can generalize across tests.

compiler-errors
compiler-errors reviewed May 19, 2024
View reviewed changes
compiler/rustc_hir_typeck/src/fallback.rs Outdated Show resolved Hide resolved
compiler/rustc_hir_typeck/src/fallback.rs Outdated Show resolved Hide resolved
compiler/rustc_hir_typeck/src/fallback.rs Outdated Show resolved Hide resolved
compiler/rustc_hir_typeck/src/fallback.rs Outdated Show resolved Hide resolved
compiler/rustc_hir_typeck/src/fallback.rs Outdated Show resolved Hide resolved
@WaffleLapkin
Copy link
Member Author

Quite a few of existing tests get the warning, should I do something with it? The options I see are bless them (what I currently did), fix them and allow the warning.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented May 20, 2024

☔ The latest upstream changes (presumably #125313) made this pull request unmergeable. Please resolve the merge conflicts.

@rustbot
Copy link
Collaborator

rustbot commented May 21, 2024

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jun 11, 2024

📌 Commit b73eb9a has been approved by compiler-errors

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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 11, 2024
@compiler-errors
Copy link
Member

actually wait wait i forgot to run perf ever

@bors r-

@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 Jun 11, 2024
@compiler-errors
Copy link
Member

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 11, 2024
@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 Jun 12, 2024
cjgillot
cjgillot reviewed Jun 12, 2024
View reviewed changes
tests/ui/delegation/not-supported.rs
@@ -70,12 +70,16 @@ mod opaque {

pub fn opaque_arg(_: impl Trait) -> i32 { 0 }
pub fn opaque_ret() -> impl Trait { unimplemented!() }
//~^ warn: this function depends on never type fallback being `()`
//~| warn: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a way to show what error would be emitted?

Copy link
Member

Choose a reason for hiding this comment

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

I've implemented a rudimentary attempt at #126367

@compiler-errors
Copy link
Member

compiler-errors commented Jun 13, 2024 •
edited
Loading

@bors r-

please rebase and bless tests, then r=me!

@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 Jun 13, 2024
@compiler-errors compiler-errors mentioned this pull request Jun 13, 2024
Merged
@WaffleLapkin
Implement lint for obligations broken by never type fallback change
83f8f9f
@WaffleLapkin
Add a fast exit to `lint_obligations_broken_by_never_type_fallback_ch…
b88d03b 
…ange`
@WaffleLapkin
Apply review nits
0f41d26
@WaffleLapkin
Bless a test
268b556
@WaffleLapkin
Fixup clippy tests
a22f8aa 
Don't depend on the fact that `!` falls back to `()` and so panic-ish things
can be used in `-> impl ImplementedForUnit` functions
@WaffleLapkin
Fixup links in lint docs
8400cd0 
looks like prim@ stuff does not work here (is it possibly not handled by rustdoc at all?)
@WaffleLapkin
rebase blessing
ea98e42
@WaffleLapkin
Copy link
Member Author

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Jun 13, 2024

📌 Commit ea98e42 has been approved by compiler-errors

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

bors commented Jun 13, 2024

⌛ Testing commit ea98e42 with merge b6e5e3f...

@bors
Copy link
Contributor

bors commented Jun 13, 2024

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing b6e5e3f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 13, 2024
@bors bors merged commit b6e5e3f into rust-lang:master Jun 13, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 13, 2024
@bors bors mentioned this pull request Jun 13, 2024
Open
@WaffleLapkin WaffleLapkin deleted the never-obligations branch June 13, 2024 18:49
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b6e5e3f): comparison URL.

Overall result: ❌ regressions - 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.2% [0.2%, 0.2%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 1.3%)

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)		 5.5% [5.5%, 5.5%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.8% [-1.2%, -0.5%] 2
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 1.3% [-1.2%, 5.5%] 3

Cycles

Results (primary -3.4%)

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.4% [-7.0%, -1.0%] 14
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -3.4% [-7.0%, -1.0%] 14

Binary size

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

Bootstrap: 672.787s -> 671.147s (-0.24%)
Artifact size: 320.34 MiB -> 320.41 MiB (0.02%)

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 15, 2024
@matthiaskrgr
Rollup merge of rust-lang#126367 - compiler-errors:point-out-failing-…
b473ec2 
…never-obligation, r=WaffleLapkin

Point out failing never obligation for `DEPENDENCY_ON_UNIT_NEVER_TYPE_FALLBACK`

Based on top of rust-lang#125289, so just need to look at the last commit.

r? `@WaffleLapkin`
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 15, 2024
@rust-timer
Unrolled build for rust-lang#126367
7e90b28 
Rollup merge of rust-lang#126367 - compiler-errors:point-out-failing-never-obligation, r=WaffleLapkin

Point out failing never obligation for `DEPENDENCY_ON_UNIT_NEVER_TYPE_FALLBACK`

Based on top of rust-lang#125289, so just need to look at the last commit.

r? `@WaffleLapkin`
@traviscross traviscross mentioned this pull request Jul 23, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cjgillot cjgillot cjgillot left review comments

@compiler-errors compiler-errors compiler-errors left review comments

@jackh726 jackh726 jackh726 left review comments

Assignees

@compiler-errors compiler-errors

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.81.0
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@WaffleLapkin @rust-log-analyzer @jackh726 @bors @rustbot @compiler-errors @rust-timer @cjgillot