From 9acfde7c5a38918552d2e95519f31493a4690216 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 14 Dec 2016 21:54:34 +0300 Subject: [PATCH] Revert changes from daac46b since kotlin.Comparator now has lower priority than explicit star-import of java.util.* --- .../testData/diagnostics/testsWithStdLib/when/kt10807.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/testData/diagnostics/testsWithStdLib/when/kt10807.txt b/compiler/testData/diagnostics/testsWithStdLib/when/kt10807.txt index 6b8543dad30..b3a68964599 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/when/kt10807.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/when/kt10807.txt @@ -1,7 +1,7 @@ package -public fun getComp(): kotlin.comparisons.Comparator /* = java.util.Comparator */ -public fun getCompInverted(): kotlin.comparisons.Comparator /* = java.util.Comparator */ +public fun getComp(): java.util.Comparator +public fun getCompInverted(): java.util.Comparator public final class Foo { public constructor Foo(/*0*/ a: kotlin.String, /*1*/ b: kotlin.Int)