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

Improve const mismatch FulfillmentError #100437

Merged
merged 4 commits into from
Aug 29, 2022
Merged

Improve const mismatch FulfillmentError #100437

merged 4 commits into from
Aug 29, 2022

Conversation

compiler-errors
Copy link
Member

Fixes #100414

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Aug 12, 2022
@rust-highfive
Copy link
Collaborator

r? @oli-obk

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 12, 2022
compiler-errors
compiler-errors commented Aug 12, 2022
View reviewed changes
compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs Outdated
.emit();
);
let code = error.obligation.cause.code().peel_derives().peel_match_impls();
if let ObligationCauseCode::BindingObligation(..) | ObligationCauseCode::ItemObligation(..) = code {
Copy link
Member Author

Choose a reason for hiding this comment

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

This is weird, but I found that other ObligationCauseCodes provided strange messages. I can create a diff if the reviewer is curious to see what I mean, but BindingObligation and ItemObligation are general enough that their message is always pretty useful.

@compiler-errors compiler-errors force-pushed the better-const-mismatch-err branch from 8dbaace to a5725a9 Compare August 12, 2022 03:54
@oli-obk
Copy link
Contributor

oli-obk commented Aug 22, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Aug 22, 2022

📌 Commit a5725a9 has been approved by oli-obk

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 Aug 22, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 23, 2022
@matthiaskrgr
Rollup merge of rust-lang#100437 - compiler-errors:better-const-misma…
c81349d 
…tch-err, r=oli-obk

Improve const mismatch `FulfillmentError`

Fixes rust-lang#100414
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 23, 2022
Closed
@matthiaskrgr
Copy link
Member

@bors r-
failed in #100902 (comment)
😕 maybe needs a reblessing?

@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 Aug 23, 2022
@compiler-errors compiler-errors force-pushed the better-const-mismatch-err branch from a5725a9 to 8189a45 Compare August 24, 2022 17:54
@oli-obk
Copy link
Contributor

oli-obk commented Aug 25, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Aug 25, 2022

📌 Commit 8189a45 has been approved by oli-obk

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 Aug 25, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Aug 26, 2022
@Dylan-DPC
Rollup merge of rust-lang#100437 - compiler-errors:better-const-misma…
57d438f 
…tch-err, r=oli-obk

Improve const mismatch `FulfillmentError`

Fixes rust-lang#100414
@Dylan-DPC Dylan-DPC mentioned this pull request Aug 26, 2022
Closed
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Aug 26, 2022
@Dylan-DPC
Rollup merge of rust-lang#100437 - compiler-errors:better-const-misma…
7bd551b 
…tch-err, r=oli-obk

Improve const mismatch `FulfillmentError`

Fixes rust-lang#100414
@Dylan-DPC Dylan-DPC mentioned this pull request Aug 26, 2022
Closed
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Aug 26, 2022
@Dylan-DPC
Rollup merge of rust-lang#100437 - compiler-errors:better-const-misma…
d35938d 
…tch-err, r=oli-obk

Improve const mismatch `FulfillmentError`

Fixes rust-lang#100414
@Dylan-DPC Dylan-DPC mentioned this pull request Aug 26, 2022
Closed
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Aug 26, 2022
@Dylan-DPC
Rollup merge of rust-lang#100437 - compiler-errors:better-const-misma…
30b301d 
…tch-err, r=oli-obk

Improve const mismatch `FulfillmentError`

Fixes rust-lang#100414
@Dylan-DPC Dylan-DPC mentioned this pull request Aug 26, 2022
Closed
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Aug 27, 2022
@Dylan-DPC
Rollup merge of rust-lang#100437 - compiler-errors:better-const-misma…
50bc88e 
…tch-err, r=oli-obk

Improve const mismatch `FulfillmentError`

Fixes rust-lang#100414
@Dylan-DPC Dylan-DPC mentioned this pull request Aug 27, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 28, 2022
@matthiaskrgr
Rollup merge of rust-lang#100437 - compiler-errors:better-const-misma…
ea30a62 
…tch-err, r=oli-obk

Improve const mismatch `FulfillmentError`

Fixes rust-lang#100414
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 28, 2022
Closed
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Aug 28, 2022
@Dylan-DPC
Rollup merge of rust-lang#100437 - compiler-errors:better-const-misma…
91de6b6 
…tch-err, r=oli-obk

Improve const mismatch `FulfillmentError`

Fixes rust-lang#100414
@Dylan-DPC Dylan-DPC mentioned this pull request Aug 28, 2022
Closed
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Aug 28, 2022
@Dylan-DPC
Rollup merge of rust-lang#100437 - compiler-errors:better-const-misma…
ea2e810 
…tch-err, r=oli-obk

Improve const mismatch `FulfillmentError`

Fixes rust-lang#100414
@Dylan-DPC Dylan-DPC mentioned this pull request Aug 28, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 28, 2022
@matthiaskrgr
Rollup merge of rust-lang#100437 - compiler-errors:better-const-misma…
4d9d2b2 
…tch-err, r=oli-obk

Improve const mismatch `FulfillmentError`

Fixes rust-lang#100414
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 28, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 28, 2022
@matthiaskrgr
Rollup merge of rust-lang#100437 - compiler-errors:better-const-misma…
ed0b5af 
…tch-err, r=oli-obk

Improve const mismatch `FulfillmentError`

Fixes rust-lang#100414
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 28, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 28, 2022
@matthiaskrgr
Rollup merge of rust-lang#100437 - compiler-errors:better-const-misma…
969f79c 
…tch-err, r=oli-obk

Improve const mismatch `FulfillmentError`

Fixes rust-lang#100414
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 28, 2022
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 29, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 29, 2022
@bors
Auto merge of rust-lang#101143 - matthiaskrgr:rollup-g8y5k0g, r=matth…
94b2b15 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#94890 (Support parsing IP addresses from a byte string)
 - rust-lang#96334 (socket `set_mark` addition.)
 - rust-lang#99027 (Replace `Body::basic_blocks()` with field access)
 - rust-lang#100437 (Improve const mismatch `FulfillmentError`)
 - rust-lang#100843 (Migrate part of rustc_infer to session diagnostic)
 - rust-lang#100897 (extra sanity check against consts pointing to mutable memory)
 - rust-lang#100959 (translations: rename warn_ to warning)
 - rust-lang#101111 (Use the declaration's SourceInfo for FnEntry retags, not the outermost)
 - rust-lang#101116 ([rustdoc] Remove Attrs type alias)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 26c86c6 into rust-lang:master Aug 29, 2022
@rustbot rustbot added this to the 1.65.0 milestone Aug 29, 2022
@compiler-errors compiler-errors deleted the better-const-mismatch-err branch August 11, 2023 19:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
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.65.0
Development

Successfully merging this pull request may close these issues.

Confusing error message when feature generic_const_exprs is used.
6 participants
@compiler-errors @rust-highfive @oli-obk @bors @matthiaskrgr @rustbot