Better error for non const `PartialEq` call generated by `match` #112232

fee1-dead · 2023-06-03T04:29:09Z

Resolves #90237

rustbot · 2023-06-03T04:29:14Z

r? @b-naber

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2023-06-03T04:29:17Z

This PR changes Stable MIR

cc @oli-obk, @celinval

This PR changes MIR

cc @oli-obk, @RalfJung, @JakobDegen, @davidtwco, @celinval, @vakaras

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

rustbot · 2023-06-03T04:45:43Z

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

deltragon · 2023-06-03T09:11:23Z

tests/ui/rfc-2632-const-trait-impl/match-non-const-eq.stock.stderr

+   |
+   = note: `str` cannot be compared in compile-time, and therefore cannot be used in `match`es
+   = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable


Does this help note appear to users on stable too? It seems confusing either way, as adding it doesn't fix the error (just makes it slightly more detailed).

No it doesn't. Stable users don't get the suggestion to add unstable features.

b-naber

LGTM. Had some thoughts/nits.

b-naber · 2023-06-13T21:28:59Z

compiler/rustc_const_eval/src/errors.rs

@@ -271,6 +271,18 @@ pub struct RawBytesNote {
    pub bytes: String,
 }

+// FIXME(fee1-dead) do not use stringly typed `ConstContext`


Did you include this as a reminder to be fixed in this PR or do you want to change this later?

I want to change this later, not in this PR

b-naber · 2023-06-13T21:30:49Z

compiler/rustc_middle/src/mir/syntax.rs

+/// Represents how a `TerminatorKind::Call` was constructed, used for diagnostics
+#[derive(Clone, Copy, TyEncodable, TyDecodable, Debug, PartialEq, Hash, HashStable)]
+#[derive(TypeFoldable, TypeVisitable)]
+pub enum CallDesugaring {


Should this use a different name? Isn't desugaring exclusively used to refer to lowering of source-level constructs to internal constructs? So maybe ThirCallSource or something would be more appropriate?

I'm not sure if ThirCallSource would be better as that means Option<ThirCallSource>::None means that there was no call source from THIR. Option<CallDesugaring>::None suggests that it was a normal call. For CallDesugaring::Misc they still didn't come from normal calls so it would still mean using calls internally to represent code that does not explicitly try to call functions

Why can't we do this? 😅

enum ThirCallSource { HirCall, OverloadedOperator, MatchCmp, Misc, }

b-naber · 2023-06-13T21:33:11Z

compiler/rustc_const_eval/src/transform/check_consts/ops.rs

@@ -100,7 +100,7 @@ pub struct FnCallNonConst<'tcx> {
    pub callee: DefId,
    pub substs: SubstsRef<'tcx>,
    pub span: Span,
-    pub from_hir_call: bool,
+    pub desugar: Option<CallDesugaring>,


Can you add a similar comment to the one in TerminatorKind?

b-naber · 2023-06-13T21:34:30Z

compiler/rustc_middle/src/mir/syntax.rs

+    /// is false then this is the desugaring.
+    OverloadedOperator,
+    /// This was from comparison generated by a match.
+    MatchCmp,


Can you link to #90237 here?

bors · 2023-06-15T00:10:38Z

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

bors · 2023-06-17T20:04:51Z

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

b-naber · 2023-06-18T06:24:37Z

Thanks for changing that.

@bors r+ rollup

bors · 2023-06-18T06:24:39Z

📌 Commit 89c24af has been approved by b-naber

It is now in the queue for this repository.

…sg, r=b-naber Better error for non const `PartialEq` call generated by `match` Resolves rust-lang#90237

compiler-errors · 2023-06-18T20:16:16Z

@bors r- failed in rollup: #112771 (comment)

b-naber · 2023-06-19T20:45:44Z

@bors r+ rollup

bors · 2023-06-19T20:45:45Z

📌 Commit 446db51 has been approved by b-naber

It is now in the queue for this repository.

…mpiler-errors Rollup of 8 pull requests Successful merges: - rust-lang#112232 (Better error for non const `PartialEq` call generated by `match`) - rust-lang#112499 (Fix python linting errors) - rust-lang#112596 (Suggest correct signature on missing fn returning RPITIT/AFIT) - rust-lang#112606 (Alter `Display` for `Ipv6Addr` for IPv4-compatible addresses) - rust-lang#112781 (Don't consider TAIT normalizable to hidden ty if it would result in impossible item bounds) - rust-lang#112787 (Add gha problem matcher) - rust-lang#112799 (Clean up "doc(hidden)" check) - rust-lang#112803 (Format the examples directory of cg_clif) r? `@ghost` `@rustbot` modify labels: rollup

…sg, r=b-naber Better error for non const `PartialEq` call generated by `match` Resolves rust-lang#90237

rustbot assigned b-naber Jun 3, 2023

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 Jun 3, 2023

This comment has been minimized.

Sign in to view

fee1-dead force-pushed the match-eq-const-msg branch from f565198 to fd60cbc Compare June 3, 2023 04:45

deltragon reviewed Jun 3, 2023

View reviewed changes

b-naber approved these changes Jun 13, 2023

View reviewed changes

fee1-dead force-pushed the match-eq-const-msg branch from fd60cbc to f345403 Compare June 15, 2023 17:07

This comment has been minimized.

Sign in to view

fee1-dead force-pushed the match-eq-const-msg branch from 61db4ed to 3de318b Compare June 18, 2023 05:08

Better error for non const PartialEq call generated by match

89c24af

fee1-dead force-pushed the match-eq-const-msg branch from 3de318b to 89c24af Compare June 18, 2023 05:26

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 18, 2023

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 18, 2023

Rollup merge of rust-lang#112232 - fee1-dead-contrib:match-eq-const-m…

7b91275

…sg, r=b-naber Better error for non const `PartialEq` call generated by `match` Resolves rust-lang#90237

matthiaskrgr mentioned this pull request Jun 18, 2023

Rollup of 6 pull requests #112771

Closed

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 18, 2023

fix doc

446db51

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 19, 2023

compiler-errors mentioned this pull request Jun 20, 2023

Rollup of 8 pull requests #112817

Merged

bors merged commit 31d1fbf into rust-lang:master Jun 20, 2023

rustbot added this to the 1.72.0 milestone Jun 20, 2023

flip1995 pushed a commit to flip1995/rust that referenced this pull request Jun 30, 2023

Rollup merge of rust-lang#112232 - fee1-dead-contrib:match-eq-const-m…

9a65f46

…sg, r=b-naber Better error for non const `PartialEq` call generated by `match` Resolves rust-lang#90237

bjorn3 pushed a commit to bjorn3/rust that referenced this pull request Jul 22, 2023

Rollup merge of rust-lang#112232 - fee1-dead-contrib:match-eq-const-m…

7ba31b9

…sg, r=b-naber Better error for non const `PartialEq` call generated by `match` Resolves rust-lang#90237

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Better error for non const `PartialEq` call generated by `match` #112232

Better error for non const `PartialEq` call generated by `match` #112232

fee1-dead commented Jun 3, 2023

rustbot commented Jun 3, 2023

rustbot commented Jun 3, 2023

This comment has been minimized.

rustbot commented Jun 3, 2023

deltragon Jun 3, 2023 •

edited

Loading

fee1-dead Jun 3, 2023 •

edited

Loading

b-naber left a comment

b-naber Jun 13, 2023

fee1-dead Jun 15, 2023

b-naber Jun 13, 2023

fee1-dead Jun 15, 2023

b-naber Jun 15, 2023

b-naber Jun 13, 2023

b-naber Jun 13, 2023

bors commented Jun 15, 2023

This comment has been minimized.

bors commented Jun 17, 2023

b-naber commented Jun 18, 2023

bors commented Jun 18, 2023

compiler-errors commented Jun 18, 2023

b-naber commented Jun 19, 2023

bors commented Jun 19, 2023

Better error for non const PartialEq call generated by match #112232

Better error for non const PartialEq call generated by match #112232

Conversation

fee1-dead commented Jun 3, 2023

rustbot commented Jun 3, 2023

rustbot commented Jun 3, 2023

This comment has been minimized.

rustbot commented Jun 3, 2023

deltragon Jun 3, 2023 • edited Loading

Choose a reason for hiding this comment

fee1-dead Jun 3, 2023 • edited Loading

Choose a reason for hiding this comment

b-naber left a comment

Choose a reason for hiding this comment

b-naber Jun 13, 2023

Choose a reason for hiding this comment

fee1-dead Jun 15, 2023

Choose a reason for hiding this comment

b-naber Jun 13, 2023

Choose a reason for hiding this comment

fee1-dead Jun 15, 2023

Choose a reason for hiding this comment

b-naber Jun 15, 2023

Choose a reason for hiding this comment

b-naber Jun 13, 2023

Choose a reason for hiding this comment

b-naber Jun 13, 2023

Choose a reason for hiding this comment

bors commented Jun 15, 2023

This comment has been minimized.

bors commented Jun 17, 2023

b-naber commented Jun 18, 2023

bors commented Jun 18, 2023

compiler-errors commented Jun 18, 2023

b-naber commented Jun 19, 2023

bors commented Jun 19, 2023

Better error for non const `PartialEq` call generated by `match` #112232

Better error for non const `PartialEq` call generated by `match` #112232

deltragon Jun 3, 2023 •

edited

Loading

fee1-dead Jun 3, 2023 •

edited

Loading