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

Change default upper bound of Java type parameters to Any!

Browse Source 
#KT-7672 Fixed
This commit is contained in:
Denis Zharkov
2015-07-17 12:11:56 +03:00
parent 0e69ebb288
commit 97af85da9c
119 changed files with 326 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public interface LoadIterable</*0*/ T> {
public interface LoadIterable</*0*/ T : kotlin.Any!> {
org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T!>!
org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable<T!>!
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T!>!): kotlin.Unit
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public interface LoadIterableWithConflict</*0*/ T> {
public interface LoadIterableWithConflict</*0*/ T : kotlin.Any!> {
org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public interface LoadIterableWithNullability</*0*/ T> {
public interface LoadIterableWithNullability</*0*/ T : kotlin.Any!> {
org.jetbrains.annotations.NotNull() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T!>
org.jetbrains.annotations.NotNull() org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable<T!>
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() org.jetbrains.annotations.NotNull() p0: kotlin.MutableIterable<T!>): kotlin.Unit
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt
Vendored
+3 -3
View File
@@ -2,15 +2,15 @@ package test
public interface LoadIterableWithPropagation {
public interface LoadIterable</*0*/ T> {
public interface LoadIterable</*0*/ T : kotlin.Any!> {
org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T!>!
org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable<T!>!
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T!>!): kotlin.Unit
public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable<T!>!): kotlin.Unit
}
public open class LoadIterableImpl</*0*/ T> : test.LoadIterableWithPropagation.LoadIterable<T!> {
public constructor LoadIterableImpl</*0*/ T>()
public open class LoadIterableImpl</*0*/ T : kotlin.Any!> : test.LoadIterableWithPropagation.LoadIterable<T!> {
public constructor LoadIterableImpl</*0*/ T : kotlin.Any!>()
public open override /*1*/ fun getIterable(): kotlin.MutableIterable<T!>!
public open override /*1*/ fun getReadOnlyIterable(): kotlin.Iterable<T!>!
public open override /*1*/ fun setIterable(/*0*/ p0: kotlin.MutableIterable<T!>!): kotlin.Unit