1.1 --- a/test/tools/javac/generics/diamond/neg/Neg05.out Thu Jul 26 16:48:41 2012 -0700
1.2 +++ b/test/tools/javac/generics/diamond/neg/Neg05.out Thu Aug 02 18:22:41 2012 +0100
1.3 @@ -1,19 +1,19 @@
1.4 Neg05.java:19:48: compiler.err.improperly.formed.type.inner.raw.param
1.5 -Neg05.java:19:35: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>
1.6 +Neg05.java:19:35: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>)
1.7 Neg05.java:20:58: compiler.err.improperly.formed.type.inner.raw.param
1.8 -Neg05.java:20:45: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String>
1.9 +Neg05.java:20:45: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String>)
1.10 Neg05.java:21:43: compiler.err.improperly.formed.type.inner.raw.param
1.11 -Neg05.java:21:30: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>
1.12 +Neg05.java:21:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>)
1.13 Neg05.java:22:56: compiler.err.improperly.formed.type.inner.raw.param
1.14 -Neg05.java:22:43: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String>
1.15 +Neg05.java:22:43: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String>)
1.16 Neg05.java:24:48: compiler.err.improperly.formed.type.inner.raw.param
1.17 -Neg05.java:24:35: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>
1.18 +Neg05.java:24:35: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>)
1.19 Neg05.java:25:58: compiler.err.improperly.formed.type.inner.raw.param
1.20 -Neg05.java:25:45: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String>
1.21 +Neg05.java:25:45: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String>)
1.22 Neg05.java:26:43: compiler.err.improperly.formed.type.inner.raw.param
1.23 -Neg05.java:26:30: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>
1.24 +Neg05.java:26:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>)
1.25 Neg05.java:27:56: compiler.err.improperly.formed.type.inner.raw.param
1.26 -Neg05.java:27:43: compiler.err.prob.found.req: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String>
1.27 +Neg05.java:27:43: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String>)
1.28 Neg05.java:31:37: compiler.err.improperly.formed.type.inner.raw.param
1.29 Neg05.java:32:47: compiler.err.improperly.formed.type.inner.raw.param
1.30 Neg05.java:33:32: compiler.err.improperly.formed.type.inner.raw.param
