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

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

Issue 2718643003: fix future onError handler wrapping to avoid cast error (Closed)
Patch Set: Created 3 years, 10 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/future_impl.dart » ('j') | sdk/lib/async/future_impl.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/async/async_error.dart
diff --git a/sdk/lib/async/async_error.dart b/sdk/lib/async/async_error.dart
index 62996c314e2ad8ec2eaf633c5d9bbff70d8fce57..dd9bf72056adf557106a8953e654e6346d753418 100644
--- a/sdk/lib/async/async_error.dart
+++ b/sdk/lib/async/async_error.dart
@@ -14,13 +14,15 @@ _invokeErrorHandler(Function errorHandler,
}
}
-Function _registerErrorHandler<R>(Function errorHandler, Zone zone) {
+Function _registerErrorHandler(Function errorHandler, Zone zone) {
+ // We are not allowed to use 'void' as type argument for the generic type,
+ // so we use 'dynamic' instead.
if (errorHandler is ZoneBinaryCallback) {
- return zone.registerBinaryCallback<R, dynamic, StackTrace>(
- errorHandler as dynamic/*=ZoneBinaryCallback<R, dynamic, StackTrace>*/);
+ return zone.registerBinaryCallback<dynamic, dynamic, StackTrace>(
+ errorHandler as dynamic/*=ZoneBinaryCallback<dynamic, dynamic, StackTrace>*/);
} else {
- return zone.registerUnaryCallback<R, dynamic>(
- errorHandler as dynamic/*=ZoneUnaryCallback<R, dynamic>*/);
+ return zone.registerUnaryCallback<dynamic, dynamic>(
+ errorHandler as dynamic/*=ZoneUnaryCallback<dynamic, dynamic>*/);
}
}
« no previous file with comments | « no previous file | sdk/lib/async/future_impl.dart » ('j') | sdk/lib/async/future_impl.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698