Merge remote-tracking branch 'upstream/master' into patch-no-std-runtime

stevefan1999-personal · stevefan1999-personal · commit 64b5c959bc94 · 2023-04-04T22:13:30.000+08:00
diff --git a/tests/compile-fail/rust_action_type_error.stderr b/tests/compile-fail/rust_action_type_error.stderr
@@ -7,6 +7,11 @@ error[E0308]: mismatched types
    |                           expected struct `X`, found struct `Y`
    |                           arguments to this enum variant are incorrect
    |
+help: the type constructed contains `Y` due to the type of the argument passed
+  --> $DIR/rust_action_type_error.rs:7:27
+   |
+7  |     rule foo() -> X = "a" { Y } //~ ERROR
+   |                           ^^^^^ this argument influences the type of `{{root}}`
 note: tuple variant defined here
   --> $DIR/lib.rs:14:5
    |

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,11 @@ error[E0308]: mismatched types`
`7`	`7`	\| expected struct `X`, found struct `Y`
`8`	`8`	`\| arguments to this enum variant are incorrect`
`9`	`9`	`\|`
	`10`	+help: the type constructed contains `Y` due to the type of the argument passed
	`11`	`+ --> $DIR/rust_action_type_error.rs:7:27`
	`12`	`+ \|`
	`13`	`+7 \| rule foo() -> X = "a" { Y } //~ ERROR`
	`14`	+ \| ^^^^^ this argument influences the type of `{{root}}`
`10`	`15`	`note: tuple variant defined here`
`11`	`16`	`--> $DIR/lib.rs:14:5`
`12`	`17`	`\|`