File tree 3 files changed +53
-1
lines changed
compiler/rustc_parse/src/parser
src/test/ui/const-generics/issues
3 files changed +53
-1
lines changed Original file line number Diff line number Diff line change @@ -1955,7 +1955,19 @@ impl<'a> Parser<'a> {
1955
1955
}
1956
1956
match self . parse_expr_res ( Restrictions :: CONST_EXPR , None ) {
1957
1957
Ok ( expr) => {
1958
- if token:: Comma == self . token . kind || self . token . kind . should_end_const_arg ( ) {
1958
+ // Find a mistake like `MyTrait<Assoc == S::Assoc>`.
1959
+ if token:: EqEq == snapshot. token . kind {
1960
+ err. span_suggestion (
1961
+ snapshot. token . span ,
1962
+ "replace `==` with `=`" ,
1963
+ "=" . to_string ( ) ,
1964
+ Applicability :: MaybeIncorrect ,
1965
+ ) ;
1966
+ let value = self . mk_expr_err ( expr. span ) ;
1967
+ err. emit ( ) ;
1968
+ return Ok ( GenericArg :: Const ( AnonConst { id : ast:: DUMMY_NODE_ID , value } ) ) ;
1969
+ } else if token:: Comma == self . token . kind || self . token . kind . should_end_const_arg ( )
1970
+ {
1959
1971
// Avoid the following output by checking that we consumed a full const arg:
1960
1972
// help: expressions must be enclosed in braces to be used as const generic
1961
1973
// arguments
Original file line number Diff line number Diff line change
1
+ pub trait MyTrait {
2
+ type Assoc ;
3
+ }
4
+
5
+ pub fn foo < S , T > ( _s : S , _t : T )
6
+ where
7
+ S : MyTrait ,
8
+ T : MyTrait < Assoc == S :: Assoc > ,
9
+ //~^ ERROR: expected one of `,` or `>`, found `==`
10
+ //~| ERROR: this trait takes 0 generic arguments but 1 generic argument was supplied
11
+ {
12
+ }
13
+
14
+ fn main ( ) { }
Original file line number Diff line number Diff line change
1
+ error: expected one of `,` or `>`, found `==`
2
+ --> $DIR/issue-87493.rs:8:22
3
+ |
4
+ LL | T: MyTrait<Assoc == S::Assoc>,
5
+ | ^^
6
+ | |
7
+ | expected one of `,` or `>`
8
+ | help: replace `==` with `=`: `=`
9
+
10
+ error[E0107]: this trait takes 0 generic arguments but 1 generic argument was supplied
11
+ --> $DIR/issue-87493.rs:8:8
12
+ |
13
+ LL | T: MyTrait<Assoc == S::Assoc>,
14
+ | ^^^^^^^------------------- help: remove these generics
15
+ | |
16
+ | expected 0 generic arguments
17
+ |
18
+ note: trait defined here, with 0 generic parameters
19
+ --> $DIR/issue-87493.rs:1:11
20
+ |
21
+ LL | pub trait MyTrait {
22
+ | ^^^^^^^
23
+
24
+ error: aborting due to 2 previous errors
25
+
26
+ For more information about this error, try `rustc --explain E0107`.
You can’t perform that action at this time.
0 commit comments