From db91928984e54f191bfcc16d5f40a464896fe223 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Thu, 7 Feb 2013 16:35:39 +0400
Subject: [PATCH] test fixes after refactorings expected return type for
 function literal cannot depend on expected type of outer function

---
 .../tests/inference/possibleCycleOnConstraints.kt           | 2 +-
 .../inference/reportingImprovements/FunctionPlaceholder.kt  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt
index d9ae91f79f0..db9176965ae 100644
--- a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt
+++ b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt
@@ -9,5 +9,5 @@ fun test() {
     val <!UNUSED_VARIABLE!>x<!> = g { Collections.<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>() }
 
     val <!UNUSED_VARIABLE!>y<!> = g<Int> { Collections.emptyList() }
-    val <!UNUSED_VARIABLE!>z<!> : List<Int> = g { Collections.emptyList() }
+    val <!UNUSED_VARIABLE!>z<!> : List<Int> = g { Collections.<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>() }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt
index 18d0f3a35e1..afc5efa9897 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt
@@ -10,7 +10,7 @@ fun test() {
     <!TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH!>foo<!> <!TYPE_MISMATCH!>{ <!CANNOT_INFER_PARAMETER_TYPE!>x<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!>}<!>
     <!TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH!>foo<!> <!TYPE_MISMATCH!>{ (x: Int) -> x}<!>
 
-    bar { <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1 }
-    bar { <!CANNOT_INFER_PARAMETER_TYPE!>x<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1}
+    <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>bar<!> { <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1 }
+    <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>bar<!> { <!CANNOT_INFER_PARAMETER_TYPE!>x<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1}
     bar { (x: Int) -> x + 1}
-}
+}
\ No newline at end of file