File tree 2 files changed +8
-0
lines changed
tests/ui/const-generics/generic_const_exprs/const_kind_expr
2 files changed +8
-0
lines changed Original file line number Diff line number Diff line change 20
20
//~^^^ ERROR: function takes 1 generic argument but 2 generic arguments were supplied
21
21
//~^^^^ ERROR: unconstrained generic constant
22
22
//~^^^^^ ERROR: unconstrained generic constant `L + 1 + L`
23
+ <<<<<<< HEAD
23
24
//~^^^^^^ ERROR: unconstrained generic constant `(L - 1) + 1 + L`
25
+ =======
26
+ //~^^^^^ ERROR: unconstrained generic constant `L + 1`
27
+ >>>>>>> c3f8f3834ae ( uh )
24
28
}
25
29
26
30
fn main ( ) { }
Original file line number Diff line number Diff line change @@ -58,7 +58,11 @@ error: unconstrained generic constant `L + 1 + L`
58
58
LL | foo::<_, L>([(); L + 1 + L]);
59
59
| ^^^^^^^^^^^
60
60
61
+ <<<<<<< HEAD
61
62
error: unconstrained generic constant `{const expr}`
63
+ =======
64
+ error: unconstrained generic constant `L + 1`
65
+ >>>>>>> c3f8f3834ae (uh)
62
66
--> $DIR/issue_114151.rs:17:5
63
67
|
64
68
LL | foo::<_, L>([(); L + 1 + L]);
You can’t perform that action at this time.
0 commit comments