Mercurial > hg > openjdk > bsd-port > langtools

changeset 1169:94bb9583fe28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7101882: 2 tests fail in 7u4 workspace with new inference change Summary: missed updates for two outcome files added. Reviewed-by: mcimadamore
author dmeetry
date Fri, 21 Oct 2011 13:35:13 +0400
parents d4ea063b55af
children c6379d7e1ce4
files test/tools/javac/Diagnostics/6862608/T6862608a.out test/tools/javac/generics/inference/6638712/T6638712a.out
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/test/tools/javac/Diagnostics/6862608/T6862608a.out	Sat Oct 15 19:20:15 2011 +0400
+++ b/test/tools/javac/Diagnostics/6862608/T6862608a.out	Fri Oct 21 13:35:13 2011 +0400
@@ -1,3 +1,3 @@
-T6862608a.java:19:41: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.infer.no.conforming.instance.exists: T, java.util.Comparator<T>, java.util.Comparator<java.lang.String>)), <T>java.util.Comparator<T>, java.util.Comparator<java.lang.String>
+T6862608a.java:19:41: compiler.err.invalid.inferred.types: T, (compiler.misc.no.conforming.assignment.exists: java.util.List<java.util.Comparator<?>>, java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>)
 - compiler.misc.where.description.typevar: T,{(compiler.misc.where.typevar: T, java.lang.Object, kindname.method, <T>compound(java.lang.Iterable<? extends java.util.Comparator<? super T>>))}
 1 error
--- a/test/tools/javac/generics/inference/6638712/T6638712a.out	Sat Oct 15 19:20:15 2011 +0400
+++ b/test/tools/javac/generics/inference/6638712/T6638712a.out	Fri Oct 21 13:35:13 2011 +0400
@@ -1,2 +1,2 @@
-T6638712a.java:16:41: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.infer.no.conforming.instance.exists: T, java.util.Comparator<T>, java.util.Comparator<java.lang.String>)), <T>java.util.Comparator<T>, java.util.Comparator<java.lang.String>
+T6638712a.java:16:41: compiler.err.invalid.inferred.types: T, (compiler.misc.no.conforming.assignment.exists: java.util.List<java.util.Comparator<?>>, java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>)
 1 error