From 93bb4b0f1b884370ab59e494e91ab1dfb059fbf3 Mon Sep 17 00:00:00 2001 From: Joshua Litt Date: Thu, 13 Feb 2020 19:40:40 +0000 Subject: [PATCH] [dart2js] Migrate a couple of trivial libraries to nnbd. Change-Id: I5940b3ec3d322cabd41b68ccc128054041891b88 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/135485 Commit-Queue: Joshua Litt Reviewed-by: Sigmund Cherem --- .../tool/dart2js_nnbd_sdk_error_golden.txt | 2 -- sdk_nnbd/lib/dart2js_migration_libraries.json | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkg/dev_compiler/tool/dart2js_nnbd_sdk_error_golden.txt b/pkg/dev_compiler/tool/dart2js_nnbd_sdk_error_golden.txt index 20d4353e679..68fb6e75fc9 100644 --- a/pkg/dev_compiler/tool/dart2js_nnbd_sdk_error_golden.txt +++ b/pkg/dev_compiler/tool/dart2js_nnbd_sdk_error_golden.txt @@ -1,6 +1,4 @@ ERROR|COMPILE_TIME_ERROR|CONST_EVAL_THROWS_EXCEPTION|lib/developer/developer.dart|522|5|73|Evaluation of this constant expression throws an exception. -ERROR|COMPILE_TIME_ERROR|EXPORT_LEGACY_SYMBOL|lib/html/dart2js/html_dart2js.dart|70|8|18|The symbol 'promiseToFuture' is defined in a legacy library, and can't be re-exported from a non-nullable by default library. -ERROR|COMPILE_TIME_ERROR|EXPORT_LEGACY_SYMBOL|lib/html/html_common/html_common_dart2js.dart|19|8|14|The symbol 'promiseToFuture' is defined in a legacy library, and can't be re-exported from a non-nullable by default library. ERROR|COMPILE_TIME_ERROR|INCONSISTENT_INHERITANCE|lib/_internal/js_runtime/lib/interceptors.dart|1639|7|5|Superinterfaces don't have a valid override for '&': int.& (int* Function(int*)*), JSNumber.& (num Function(num)). ERROR|COMPILE_TIME_ERROR|INCONSISTENT_INHERITANCE|lib/_internal/js_runtime/lib/interceptors.dart|1639|7|5|Superinterfaces don't have a valid override for '<<': int.<< (int* Function(int*)*), JSNumber.<< (num Function(num)). ERROR|COMPILE_TIME_ERROR|INCONSISTENT_INHERITANCE|lib/_internal/js_runtime/lib/interceptors.dart|1639|7|5|Superinterfaces don't have a valid override for '>>': int.>> (int* Function(int*)*), JSNumber.>> (num Function(num)). diff --git a/sdk_nnbd/lib/dart2js_migration_libraries.json b/sdk_nnbd/lib/dart2js_migration_libraries.json index 25c427d7ba6..7d7fbffb70c 100644 --- a/sdk_nnbd/lib/dart2js_migration_libraries.json +++ b/sdk_nnbd/lib/dart2js_migration_libraries.json @@ -50,11 +50,11 @@ "patches": "../../sdk/lib/_internal/js_runtime/lib/js_patch.dart" }, "_js": { - "uri": "../../sdk/lib/js/_js.dart", - "patches": "../../sdk/lib/js/_js_client.dart" + "uri": "js/_js.dart", + "patches": "js/_js_client.dart" }, "js_util": { - "uri": "../../sdk/lib/js_util/js_util.dart" + "uri": "js_util/js_util.dart" }, "math": { "uri": "math/math.dart", @@ -84,7 +84,7 @@ "patches": "_internal/js_runtime/lib/internal_patch.dart" }, "_js_helper": { - "uri": "../../sdk/lib/_internal/js_runtime/lib/js_helper.dart" + "uri": "_internal/js_runtime/lib/js_helper.dart" }, "_rti": { "uri": "../../sdk/lib/_internal/js_runtime/lib/rti.dart" @@ -96,7 +96,7 @@ "uri": "_internal/js_runtime/lib/foreign_helper.dart" }, "_js_names": { - "uri": "../../sdk/lib/_internal/js_runtime/lib/js_names.dart" + "uri": "_internal/js_runtime/lib/js_names.dart" }, "_js_primitives": { "uri": "_internal/js_runtime/lib/js_primitives.dart"