azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

private / protected / internal modifiers are deprecated in interfaces, relevant tests changed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-09-22 11:30:33 +03:00
parent dcb84a7d0a
commit 731fdecf06
33 changed files with 76 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/variance/Visibility.kt
Vendored
+10 -10
View File
@@ -1,20 +1,20 @@
interface Test<in I, out O> {
val internal_val: <!TYPE_VARIANCE_CONFLICT!>I<!>
public val public_val: <!TYPE_VARIANCE_CONFLICT!>I<!>
protected val protected_val: <!TYPE_VARIANCE_CONFLICT!>I<!>
private val private_val: I
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>protected<!> val protected_val: <!TYPE_VARIANCE_CONFLICT!>I<!>
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> val private_val: I
var interlan_private_set: <!TYPE_VARIANCE_CONFLICT!>O<!>
private set
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> set
public var public_private_set: <!TYPE_VARIANCE_CONFLICT!>O<!>
private set
protected var protected_private_set: <!TYPE_VARIANCE_CONFLICT!>O<!>
private set
private var private_private_set: O
private set
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> set
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>protected<!> var protected_private_set: <!TYPE_VARIANCE_CONFLICT!>O<!>
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> set
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> var private_private_set: O
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> set
fun internal_fun(i: <!TYPE_VARIANCE_CONFLICT!>O<!>) : <!TYPE_VARIANCE_CONFLICT!>I<!>
public fun public_fun(i: <!TYPE_VARIANCE_CONFLICT!>O<!>) : <!TYPE_VARIANCE_CONFLICT!>I<!>
protected fun protected_fun(i: <!TYPE_VARIANCE_CONFLICT!>O<!>) : <!TYPE_VARIANCE_CONFLICT!>I<!>
private fun private_fun(i: O) : I
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>protected<!> fun protected_fun(i: <!TYPE_VARIANCE_CONFLICT!>O<!>) : <!TYPE_VARIANCE_CONFLICT!>I<!>
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> fun private_fun(i: O) : I
}
compiler/testData/diagnostics/tests/variance/privateToThis/Trait.kt → compiler/testData/diagnostics/tests/variance/privateToThis/Abstract.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
internal interface Test</*0*/ in I> {
internal abstract class Test</*0*/ in I> {
private/*private to this*/ final fun foo(): I {
throw Exception()
}
compiler/testData/diagnostics/tests/variance/privateToThis/Trait.txt → compiler/testData/diagnostics/tests/variance/privateToThis/Abstract.txt
Vendored
+2 -1
View File
@@ -1,6 +1,7 @@
package
internal interface Test</*0*/ in I> {
internal abstract class Test</*0*/ in I> {
public constructor Test</*0*/ in I>()
private/*private to this*/ final val i: I
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
private/*private to this*/ final fun foo(): I