1.1 --- a/test/tools/javac/generics/diamond/neg/Neg05.out Mon Mar 07 14:11:48 2011 +0000 1.2 +++ b/test/tools/javac/generics/diamond/neg/Neg05.out Mon Mar 07 14:31:50 2011 +0000 1.3 @@ -7,43 +7,19 @@ 1.4 Neg05.java:22:56: compiler.err.improperly.formed.type.inner.raw.param 1.5 Neg05.java:22:43: compiler.err.prob.found.req: (compiler.misc.incompatible.types), Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String> 1.6 Neg05.java:24:48: compiler.err.improperly.formed.type.inner.raw.param 1.7 -Neg05.java:24:35: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.anonymous.class: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String> 1.8 +Neg05.java:24:35: compiler.err.prob.found.req: (compiler.misc.incompatible.types), Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String> 1.9 Neg05.java:25:58: compiler.err.improperly.formed.type.inner.raw.param 1.10 -Neg05.java:25:45: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.anonymous.class: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String> 1.11 +Neg05.java:25:45: compiler.err.prob.found.req: (compiler.misc.incompatible.types), Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String> 1.12 Neg05.java:26:43: compiler.err.improperly.formed.type.inner.raw.param 1.13 -Neg05.java:26:30: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.anonymous.class: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?> 1.14 +Neg05.java:26:30: compiler.err.prob.found.req: (compiler.misc.incompatible.types), Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?> 1.15 Neg05.java:27:56: compiler.err.improperly.formed.type.inner.raw.param 1.16 -Neg05.java:27:43: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.anonymous.class: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String> 1.17 -Neg05.java:29:48: compiler.err.improperly.formed.type.inner.raw.param 1.18 -Neg05.java:29:35: compiler.err.prob.found.req: (compiler.misc.incompatible.types), Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String> 1.19 -Neg05.java:30:59: compiler.err.improperly.formed.type.inner.raw.param 1.20 -Neg05.java:30:46: compiler.err.prob.found.req: (compiler.misc.incompatible.types), Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String> 1.21 -Neg05.java:31:44: compiler.err.improperly.formed.type.inner.raw.param 1.22 -Neg05.java:31:31: compiler.err.prob.found.req: (compiler.misc.incompatible.types), Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?> 1.23 -Neg05.java:32:57: compiler.err.improperly.formed.type.inner.raw.param 1.24 -Neg05.java:32:44: compiler.err.prob.found.req: (compiler.misc.incompatible.types), Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String> 1.25 -Neg05.java:34:49: compiler.err.improperly.formed.type.inner.raw.param 1.26 -Neg05.java:34:36: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.anonymous.class: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<java.lang.String> 1.27 -Neg05.java:35:59: compiler.err.improperly.formed.type.inner.raw.param 1.28 -Neg05.java:35:46: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.anonymous.class: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? extends java.lang.String> 1.29 -Neg05.java:36:44: compiler.err.improperly.formed.type.inner.raw.param 1.30 -Neg05.java:36:31: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.anonymous.class: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<?> 1.31 -Neg05.java:37:57: compiler.err.improperly.formed.type.inner.raw.param 1.32 -Neg05.java:37:44: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.anonymous.class: Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String> 1.33 -Neg05.java:41:37: compiler.err.improperly.formed.type.inner.raw.param 1.34 -Neg05.java:42:47: compiler.err.improperly.formed.type.inner.raw.param 1.35 -Neg05.java:43:32: compiler.err.improperly.formed.type.inner.raw.param 1.36 -Neg05.java:44:45: compiler.err.improperly.formed.type.inner.raw.param 1.37 -Neg05.java:46:37: compiler.err.improperly.formed.type.inner.raw.param 1.38 -Neg05.java:47:47: compiler.err.improperly.formed.type.inner.raw.param 1.39 -Neg05.java:48:32: compiler.err.improperly.formed.type.inner.raw.param 1.40 -Neg05.java:49:45: compiler.err.improperly.formed.type.inner.raw.param 1.41 -Neg05.java:51:37: compiler.err.improperly.formed.type.inner.raw.param 1.42 -Neg05.java:52:48: compiler.err.improperly.formed.type.inner.raw.param 1.43 -Neg05.java:53:33: compiler.err.improperly.formed.type.inner.raw.param 1.44 -Neg05.java:54:46: compiler.err.improperly.formed.type.inner.raw.param 1.45 -Neg05.java:56:38: compiler.err.improperly.formed.type.inner.raw.param 1.46 -Neg05.java:57:48: compiler.err.improperly.formed.type.inner.raw.param 1.47 -Neg05.java:58:33: compiler.err.improperly.formed.type.inner.raw.param 1.48 -Neg05.java:59:46: compiler.err.improperly.formed.type.inner.raw.param 1.49 -48 errors 1.50 +Neg05.java:27:43: compiler.err.prob.found.req: (compiler.misc.incompatible.types), Neg05.Foo<java.lang.String>, Neg05<?>.Foo<? super java.lang.String> 1.51 +Neg05.java:31:37: compiler.err.improperly.formed.type.inner.raw.param 1.52 +Neg05.java:32:47: compiler.err.improperly.formed.type.inner.raw.param 1.53 +Neg05.java:33:32: compiler.err.improperly.formed.type.inner.raw.param 1.54 +Neg05.java:34:45: compiler.err.improperly.formed.type.inner.raw.param 1.55 +Neg05.java:36:37: compiler.err.improperly.formed.type.inner.raw.param 1.56 +Neg05.java:37:47: compiler.err.improperly.formed.type.inner.raw.param 1.57 +Neg05.java:38:32: compiler.err.improperly.formed.type.inner.raw.param 1.58 +Neg05.java:39:45: compiler.err.improperly.formed.type.inner.raw.param 1.59 +24 errors