1.1 --- a/test/tools/javac/generics/diamond/neg/Neg05.out Mon Jan 21 11:16:28 2013 -0800 1.2 +++ b/test/tools/javac/generics/diamond/neg/Neg05.out Mon Jan 21 20:13:56 2013 +0000 1.3 @@ -1,25 +1,25 @@ 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: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>) 1.6 Neg05.java:20:58: compiler.err.improperly.formed.type.inner.raw.param 1.7 -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.8 Neg05.java:21:43: compiler.err.improperly.formed.type.inner.raw.param 1.9 -Neg05.java:21:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>) 1.10 Neg05.java:22:56: compiler.err.improperly.formed.type.inner.raw.param 1.11 -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.12 Neg05.java:24:48: compiler.err.improperly.formed.type.inner.raw.param 1.13 -Neg05.java:24:35: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String>) 1.14 Neg05.java:25:58: compiler.err.improperly.formed.type.inner.raw.param 1.15 -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.16 Neg05.java:26:43: compiler.err.improperly.formed.type.inner.raw.param 1.17 -Neg05.java:26:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?>) 1.18 Neg05.java:27:56: compiler.err.improperly.formed.type.inner.raw.param 1.19 -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.20 Neg05.java:31:37: compiler.err.improperly.formed.type.inner.raw.param 1.21 +Neg05.java:31:44: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V, Neg05.Foo<V>, Neg05<?>.Foo<java.lang.String>)) 1.22 Neg05.java:32:47: compiler.err.improperly.formed.type.inner.raw.param 1.23 +Neg05.java:32:54: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V, Neg05.Foo<V>, Neg05<?>.Foo<? extends java.lang.String>)) 1.24 Neg05.java:33:32: compiler.err.improperly.formed.type.inner.raw.param 1.25 +Neg05.java:33:39: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V, Neg05.Foo<V>, Neg05<?>.Foo<?>)) 1.26 Neg05.java:34:45: compiler.err.improperly.formed.type.inner.raw.param 1.27 +Neg05.java:34:52: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V, Neg05.Foo<V>, Neg05<?>.Foo<? super java.lang.String>)) 1.28 Neg05.java:36:37: compiler.err.improperly.formed.type.inner.raw.param 1.29 +Neg05.java:36:44: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V,Z, Neg05.Foo<V>, Neg05<?>.Foo<java.lang.String>)) 1.30 Neg05.java:37:47: compiler.err.improperly.formed.type.inner.raw.param 1.31 +Neg05.java:37:54: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V,Z, Neg05.Foo<V>, Neg05<?>.Foo<? extends java.lang.String>)) 1.32 Neg05.java:38:32: compiler.err.improperly.formed.type.inner.raw.param 1.33 +Neg05.java:38:39: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V,Z, Neg05.Foo<V>, Neg05<?>.Foo<?>)) 1.34 Neg05.java:39:45: compiler.err.improperly.formed.type.inner.raw.param 1.35 +Neg05.java:39:52: compiler.err.prob.found.req: (compiler.misc.cant.apply.diamond.1: (compiler.misc.diamond: Neg05.Foo), (compiler.misc.infer.no.conforming.instance.exists: V,Z, Neg05.Foo<V>, Neg05<?>.Foo<? super java.lang.String>)) 1.36 24 errors