Add diagnostics for specific cases for const/type mismatch err #82055

JulianKnodt · 2021-02-13T07:55:54Z

For now, this adds at least more information so better diagnostics can be emitted for const mismatch errors.

I'm not sure what exactly we want to emit, so I've left notes there temporarily, also to see if this is the right approach

r? @lcnr
cc: @estebank

compiler/rustc_typeck/src/astconv/generics.rs

src/test/ui/const-generics/invalid-enum.stderr

estebank

Thank you for tackling this! It'll make this feature so much nicer to use :)

compiler/rustc_typeck/src/astconv/generics.rs

estebank · 2021-02-14T01:56:10Z

src/test/ui/const-generics/diagnostics.stderr

+error[E0747]: type provided when a constant was expected
+  --> $DIR/diagnostics.rs:7:16
+   |
+LL | impl Foo for A<N> {}
+   |                ^


This one should probably be silenced when the one above is emitted.

I don't know how to detect when the above is emitted, as from the path resolution alone I cannot tell, but I've changed the message to be more pertinent.

estebank · 2021-02-14T01:56:45Z

src/test/ui/const-generics/diagnostics.stderr

+LL | impl Foo for A<N> {}
+   |                ^ help: a struct with a similar name exists: `A`


Ideally this would suggest "you meant to add a const N here and write this as A<{ N }>".

I think it's hard to tell if a Res::Err is this case or the other case where the path was not given enough generic args

src/test/ui/const-generics/diagnostics.stderr

compiler/rustc_typeck/src/astconv/generics.rs

src/test/ui/const-generics/invalid-enum.stderr

compiler/rustc_typeck/src/astconv/generics.rs

estebank

Left a few nitpicks, we're close to landing this I think :)

compiler/rustc_typeck/src/astconv/generics.rs

JulianKnodt · 2021-02-16T04:43:46Z

Just a note, it's currently implemented where it will also emit the ordering help just for demonstration purposes, should I take it out?

estebank · 2021-02-16T17:37:58Z

Just a note, it's currently implemented where it will also emit the ordering help just for demonstration purposes, should I take it out?

Ideally we would not emit that suggestion, but I guess it is fine for now and can be dealt with in a separate PR :-/

@bors r+

bors · 2021-02-16T17:38:00Z

📌 Commit b97951b has been approved by estebank

estebank · 2021-02-16T17:38:15Z

r? @estebank

estebank · 2021-02-16T17:39:37Z

@JulianKnodt could you file tickets for the two outstanding issues (silencing the reorder suggestion and handle the impl Foo for Bar<N>) linking to the right comments in this PR?

JulianKnodt · 2021-02-16T18:22:10Z

ah sure, but why shouldn't I just silence the reordering here since I know where to put it?

estebank · 2021-02-16T18:45:51Z

Oh, if you can, go ahead.

estebank · 2021-02-16T18:46:01Z

@bors r-

estebank · 2021-02-16T19:08:59Z

@bors r+

bors · 2021-02-16T19:09:01Z

📌 Commit f520295 has been approved by estebank

Add diagnostics for specific cases for const/type mismatch err For now, this adds at least more information so better diagnostics can be emitted for const mismatch errors. I'm not sure what exactly we want to emit, so I've left notes there temporarily, also to see if this is the right approach r? `@lcnr` cc: `@estebank`

Add diagnostics for specific cases for const/type mismatch err For now, this adds at least more information so better diagnostics can be emitted for const mismatch errors. I'm not sure what exactly we want to emit, so I've left notes there temporarily, also to see if this is the right approach r? ``@lcnr`` cc: ``@estebank``

Rollup of 8 pull requests Successful merges: - rust-lang#82055 (Add diagnostics for specific cases for const/type mismatch err) - rust-lang#82155 (Use !Sync std::lazy::OnceCell in usefulness checking) - rust-lang#82202 (add specs for riscv32/riscv64 musl targets) - rust-lang#82203 (Move some tests to more reasonable directories - 4) - rust-lang#82211 (make `suggest_setup` help messages better) - rust-lang#82212 (Remove redundant rustc_data_structures path component) - rust-lang#82240 (remove useless ?s (clippy::needless_question_marks)) - rust-lang#82243 (Add more intra-doc links to std::io) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned lcnr Feb 13, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 13, 2021

This comment has been minimized.

Sign in to view

lcnr reviewed Feb 13, 2021

View reviewed changes

compiler/rustc_typeck/src/astconv/generics.rs Outdated Show resolved Hide resolved

JulianKnodt force-pushed the ty_where_const branch 2 times, most recently from 7051772 to ce12661 Compare February 13, 2021 17:01

Add additional type info to mismatch err

be1ed00

JulianKnodt force-pushed the ty_where_const branch from ce12661 to be1ed00 Compare February 13, 2021 20:37

JulianKnodt commented Feb 13, 2021

View reviewed changes

src/test/ui/const-generics/invalid-enum.stderr Show resolved Hide resolved

estebank reviewed Feb 14, 2021

View reviewed changes

JulianKnodt force-pushed the ty_where_const branch from 6a3e497 to cfae4a8 Compare February 14, 2021 05:32

This comment has been minimized.

Sign in to view

JulianKnodt force-pushed the ty_where_const branch from cfae4a8 to c86676d Compare February 14, 2021 20:18

estebank reviewed Feb 14, 2021

View reviewed changes

compiler/rustc_typeck/src/astconv/generics.rs Outdated Show resolved Hide resolved

JulianKnodt force-pushed the ty_where_const branch from c86676d to 2d08ec7 Compare February 15, 2021 02:13

estebank reviewed Feb 15, 2021

View reviewed changes

compiler/rustc_typeck/src/astconv/generics.rs Outdated Show resolved Hide resolved

estebank reviewed Feb 15, 2021

View reviewed changes

compiler/rustc_typeck/src/astconv/generics.rs Outdated Show resolved Hide resolved

JulianKnodt force-pushed the ty_where_const branch from 2d08ec7 to 73f2996 Compare February 16, 2021 00:23

This comment has been minimized.

Sign in to view

JulianKnodt force-pushed the ty_where_const branch from 73f2996 to 6fb5b6e Compare February 16, 2021 00:41

estebank reviewed Feb 16, 2021

View reviewed changes

JulianKnodt force-pushed the ty_where_const branch from 6fb5b6e to e2d1d34 Compare February 16, 2021 04:44

This comment has been minimized.

Sign in to view

Update w/ comments

b97951b

JulianKnodt force-pushed the ty_where_const branch from e2d1d34 to b97951b Compare February 16, 2021 05:14

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 Feb 16, 2021

rust-highfive assigned estebank and unassigned lcnr Feb 16, 2021

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 Feb 16, 2021

Remove ordering hint

f520295

JulianKnodt force-pushed the ty_where_const branch from 37fbd71 to f520295 Compare February 16, 2021 19:04

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 Feb 16, 2021

Dylan-DPC-zz mentioned this pull request Feb 16, 2021

Rollup of 11 pull requests #82200

Closed

Dylan-DPC-zz mentioned this pull request Feb 17, 2021

Rollup of 11 pull requests #82201

Closed

JohnTitor mentioned this pull request Feb 18, 2021

Rollup of 8 pull requests #82249

Merged

bors merged commit 0c25d15 into rust-lang:master Feb 18, 2021

rustbot added this to the 1.52.0 milestone Feb 18, 2021

JulianKnodt mentioned this pull request Feb 18, 2021

Add better diagnostic for const-generic impl Foo for S<N> #82264

Open

lcnr added the A-const-generics Area: const generics (parameters and arguments) label Dec 11, 2021

lcnr mentioned this pull request Dec 11, 2021

Tracking issue for const generics (RFC 2000) #44580

Closed

16 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add diagnostics for specific cases for const/type mismatch err #82055

Add diagnostics for specific cases for const/type mismatch err #82055

JulianKnodt commented Feb 13, 2021

This comment has been minimized.

estebank left a comment

estebank Feb 14, 2021

JulianKnodt Feb 14, 2021

estebank Feb 14, 2021

JulianKnodt Feb 14, 2021

This comment has been minimized.

This comment has been minimized.

estebank left a comment

JulianKnodt commented Feb 16, 2021

This comment has been minimized.

estebank commented Feb 16, 2021

bors commented Feb 16, 2021

estebank commented Feb 16, 2021

estebank commented Feb 16, 2021

JulianKnodt commented Feb 16, 2021

estebank commented Feb 16, 2021

estebank commented Feb 16, 2021

estebank commented Feb 16, 2021

bors commented Feb 16, 2021

		LL \| impl Foo for A<N> {}
		\| ^ help: a struct with a similar name exists: `A`

Add diagnostics for specific cases for const/type mismatch err #82055

Add diagnostics for specific cases for const/type mismatch err #82055

Conversation

JulianKnodt commented Feb 13, 2021

This comment has been minimized.

estebank left a comment

Choose a reason for hiding this comment

estebank Feb 14, 2021

Choose a reason for hiding this comment

JulianKnodt Feb 14, 2021

Choose a reason for hiding this comment

estebank Feb 14, 2021

Choose a reason for hiding this comment

JulianKnodt Feb 14, 2021

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

estebank left a comment

Choose a reason for hiding this comment

JulianKnodt commented Feb 16, 2021

This comment has been minimized.

estebank commented Feb 16, 2021

bors commented Feb 16, 2021

estebank commented Feb 16, 2021

estebank commented Feb 16, 2021

JulianKnodt commented Feb 16, 2021

estebank commented Feb 16, 2021

estebank commented Feb 16, 2021

estebank commented Feb 16, 2021

bors commented Feb 16, 2021