Deprecations cleanup: sequence -> asSequence

This commit is contained in:
Ilya Gorbunov
2015-06-25 20:25:31 +03:00
parent 765733b791
commit 5779b89ff0
12 changed files with 19 additions and 20 deletions
@@ -30,7 +30,7 @@ public class CompositeBindingContext private constructor(
private val delegates: List<BindingContext>
) : BindingContext {
override fun getType(expression: JetExpression): JetType? {
return delegates.sequence().map { it.getType(expression) }.firstOrNull { it != null }
return delegates.asSequence().map { it.getType(expression) }.firstOrNull { it != null }
}
companion object {
@@ -42,7 +42,7 @@ public class CompositeBindingContext private constructor(
}
override fun <K, V> get(slice: ReadOnlySlice<K, V>?, key: K?): V? {
return delegates.sequence().map { it[slice, key] }.firstOrNull { it != null }
return delegates.asSequence().map { it[slice, key] }.firstOrNull { it != null }
}
override fun <K, V> getKeys(slice: WritableSlice<K, V>?): Collection<K> {
@@ -65,8 +65,7 @@ public class CompositeBindingContext private constructor(
) : Diagnostics {
override fun iterator(): Iterator<Diagnostic> {
val emptyStream = listOf<Diagnostic>().sequence()
return delegates.fold(emptyStream, { r, t -> r + t.sequence() }).iterator()
return delegates.fold(emptySequence<Diagnostic>(), { r, t -> r + t.asSequence() }).iterator()
}
override val modificationTracker = object : ModificationTracker {
@@ -77,7 +77,7 @@ public class LazyAnnotations(
override fun findExternalAnnotation(fqName: FqName) = null
override fun iterator(): Iterator<AnnotationDescriptor> = annotationEntries.sequence().map(annotation).iterator()
override fun iterator(): Iterator<AnnotationDescriptor> = annotationEntries.asSequence().map(annotation).iterator()
override fun forceResolveAllContents() {
// To resolve all entries