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

Partial rollback: 'private' is no more deprecated in interfaces, some tests rolled back accordingly

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-09-25 11:44:17 +03:00
parent 505cb37052
commit 9ccf1a1729
10 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/variance/Visibility.kt
Vendored
+7 -7
View File
@@ -2,19 +2,19 @@ interface Test<in I, out O> {
val internal_val: <!TYPE_VARIANCE_CONFLICT!>I<!>
public val public_val: <!TYPE_VARIANCE_CONFLICT!>I<!>
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>protected<!> val protected_val: <!TYPE_VARIANCE_CONFLICT!>I<!>
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> val private_val: I
private val private_val: I
var interlan_private_set: <!TYPE_VARIANCE_CONFLICT!>O<!>
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> set
private set
public var public_private_set: <!TYPE_VARIANCE_CONFLICT!>O<!>
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> set
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
private set
private var private_private_set: O
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<!>
<!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
private fun private_fun(i: O) : I
}