Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Unified Diff: sdk/lib/async/merge_stream.dart

Issue 11740027: Rename unsubscribe to cancel. (Closed) Base URL: https://dart.googlecode.com/svn/experimental/lib_v2/dart
Patch Set: Address comments. Created 7 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sdk/lib/async/stream.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/async/merge_stream.dart
diff --git a/sdk/lib/async/merge_stream.dart b/sdk/lib/async/merge_stream.dart
index fcc9abac0e49569e55422aa3de40429aef9bf842..2a9d273e2cd76dfac4312efc91e4581bf38dd841 100644
--- a/sdk/lib/async/merge_stream.dart
+++ b/sdk/lib/async/merge_stream.dart
@@ -40,7 +40,7 @@ class _SupercedeEntry<T> {
void stop() {
if (!isDone) {
- subscription.unsubscribe();
+ subscription.cancel();
subscription = null;
}
}
@@ -164,10 +164,10 @@ class _CycleEntry<T> {
_CycleEntry(this.stream, this.source);
- void unsubscribe() {
+ void cancel() {
// This method may be called event if this entry has never been activated.
if (subscription != null) {
- subscription.unsubscribe();
+ subscription.cancel();
subscription = null;
}
}
@@ -242,7 +242,7 @@ class CyclicScheduleStream<T> extends _MultiStreamImpl<T> {
return;
}
for (_CycleEntry entry = _currentEntry; entry != null; entry = entry.next) {
- entry.unsubscribe();
+ entry.cancel();
}
}
« no previous file with comments | « no previous file | sdk/lib/async/stream.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698