From c111c3395082d93c6831e94e9a7001fbea3e36a6 Mon Sep 17 00:00:00 2001 From: Victor Petukhov Date: Mon, 25 Jan 2021 16:14:25 +0300 Subject: [PATCH] Fix failing tests after 8bd78064be4f2bfb671e5e0c6c04b216ff55e16a --- .../tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt | 2 +- .../nullability/callExternallyAnnotatedJavaFunction.kt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt index eec05644e1f..e56fd38df52 100644 --- a/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt +++ b/compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt @@ -29,7 +29,7 @@ class X(t: T?) { a.foo(t) val x: T = a.bam() - val y: T = a.baz() + val y: T = a.baz() } } diff --git a/nj2k/testData/inference/nullability/callExternallyAnnotatedJavaFunction.kt b/nj2k/testData/inference/nullability/callExternallyAnnotatedJavaFunction.kt index b7484f11f83..7bc793a4861 100644 --- a/nj2k/testData/inference/nullability/callExternallyAnnotatedJavaFunction.kt +++ b/nj2k/testData/inference/nullability/callExternallyAnnotatedJavaFunction.kt @@ -1,11 +1,10 @@ import java.util.Arrays.asList fun test() { - val x: /*T2@*/List = asList(1/*LIT*/)/*MutableList!!L*/ + val x: /*T2@*/List = asList(1/*LIT*/)/*MutableList*/ val i: /*T3@*/Int = Integer/*LIT*/.valueOf(""/*LIT*/)/*Int!!L*/ } //LOWER <: T0 due to 'PARAMETER' //T1 := T0 due to 'INITIALIZER' -//LOWER <: T2 due to 'INITIALIZER' //LOWER <: T3 due to 'INITIALIZER'