From 88815c40cc6beb836aa052d7ef44e24248ef3a78 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Mon, 21 Sep 2015 14:27:59 +0300 Subject: [PATCH] Minor. Fix testdata. --- compiler/testData/cli/warnings.kt | 1 - .../testData/codegen/boxWithStdlib/nonLocalReturns/use.kt | 4 ---- .../codegen/boxWithStdlib/nonLocalReturns/useWithException.kt | 4 ---- .../testData/integration/ant/js/suppressWarnings/root1/foo.kt | 1 - .../testProject/suppressWarningsAndVersion/src/helloWorld.kt | 1 - .../src/main/kotlin/org/jetbrains/HelloWorld.kt | 1 - .../src/main/kotlin/org/jetbrains/HelloWorld.kt | 1 - 7 files changed, 13 deletions(-) diff --git a/compiler/testData/cli/warnings.kt b/compiler/testData/cli/warnings.kt index 7a459c181d4..132f756ea62 100644 --- a/compiler/testData/cli/warnings.kt +++ b/compiler/testData/cli/warnings.kt @@ -1,5 +1,4 @@ import kotlin.Any -import kotlin.Any fun foo(p: Int??) { diff --git a/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/use.kt b/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/use.kt index b7d59ad992e..576ba6e6c21 100644 --- a/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/use.kt +++ b/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/use.kt @@ -1,9 +1,5 @@ import java.io.Closeable -import java.io.Closeable - -import java.io.Closeable - class MyException(message: String) : Exception(message) class Holder(var value: String) { diff --git a/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/useWithException.kt b/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/useWithException.kt index c206b3afb93..083e27a85b5 100644 --- a/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/useWithException.kt +++ b/compiler/testData/codegen/boxWithStdlib/nonLocalReturns/useWithException.kt @@ -1,7 +1,3 @@ -import java.io.Closeable - -import java.io.Closeable - import java.io.Closeable import kotlin.test.assertTrue import kotlin.test.fail diff --git a/compiler/testData/integration/ant/js/suppressWarnings/root1/foo.kt b/compiler/testData/integration/ant/js/suppressWarnings/root1/foo.kt index 46efcd61cca..996c64e3ab0 100644 --- a/compiler/testData/integration/ant/js/suppressWarnings/root1/foo.kt +++ b/compiler/testData/integration/ant/js/suppressWarnings/root1/foo.kt @@ -1,6 +1,5 @@ package foo -import kotlin.Any import kotlin.Any fun foo(p: Int??) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/suppressWarningsAndVersion/src/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/suppressWarningsAndVersion/src/helloWorld.kt index 46efcd61cca..996c64e3ab0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/suppressWarningsAndVersion/src/helloWorld.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/suppressWarningsAndVersion/src/helloWorld.kt @@ -1,6 +1,5 @@ package foo -import kotlin.Any import kotlin.Any fun foo(p: Int??) { diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/src/main/kotlin/org/jetbrains/HelloWorld.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/src/main/kotlin/org/jetbrains/HelloWorld.kt index 5f51a3cc290..4cdba9e2047 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/src/main/kotlin/org/jetbrains/HelloWorld.kt +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-suppressWarnings/src/main/kotlin/org/jetbrains/HelloWorld.kt @@ -1,6 +1,5 @@ package org.jetbrains -import kotlin.Any import kotlin.Any fun foo(p: Int??) { diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/src/main/kotlin/org/jetbrains/HelloWorld.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/src/main/kotlin/org/jetbrains/HelloWorld.kt index 50eaad2ed93..13993c990f8 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/src/main/kotlin/org/jetbrains/HelloWorld.kt +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-suppressWarnings/src/main/kotlin/org/jetbrains/HelloWorld.kt @@ -1,6 +1,5 @@ package org.jetbrains -import kotlin.Any import kotlin.Any fun foo(p: Int??) {