Merge branch 'typetools-3.43.0-fixes' into typetools-3.43.0-fixes-aosen-2

wmdietl · web-flow · commit dcc68b1ec874 · 2025-02-04T09:42:31.000-05:00
diff --git a/checker/jtreg/nullness/stub-typeparams/StubTypeParamsMeth.out b/checker/jtreg/nullness/stub-typeparams/StubTypeParamsMeth.out
@@ -1,2 +1,2 @@
-StubTypeParamsMeth.java:13:15: compiler.err.proc.messager: (type.argument.type.incompatible)
+StubTypeParamsMeth.java:13:15: compiler.err.proc.messager: (type.arguments.not.inferred)
 1 error
diff --git a/checker/jtreg/nullness/stub-typeparams/StubTypeParamsMethNbl.out b/checker/jtreg/nullness/stub-typeparams/StubTypeParamsMethNbl.out
@@ -1,2 +1,2 @@
-StubTypeParamsMethNbl.java:13:23: compiler.err.proc.messager: (type.argument.type.incompatible)
+StubTypeParamsMethNbl.java:13:23: compiler.err.proc.messager: (type.arguments.not.inferred)
 1 error

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-StubTypeParamsMeth.java:13:15: compiler.err.proc.messager: (type.argument.type.incompatible)`
	`1`	`+StubTypeParamsMeth.java:13:15: compiler.err.proc.messager: (type.arguments.not.inferred)`
`2`	`2`	`1 error`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-StubTypeParamsMethNbl.java:13:23: compiler.err.proc.messager: (type.argument.type.incompatible)`
	`1`	`+StubTypeParamsMethNbl.java:13:23: compiler.err.proc.messager: (type.arguments.not.inferred)`
`2`	`2`	`1 error`