From a5c9ff3fe9543fd6465ecbd96de2fd128213858c Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Fri, 14 Mar 2025 02:06:52 +0000 Subject: [PATCH] Remove unnecessary casts to Uint8List `utf8.encode` has indicated the `Uint8List` since Dart 3.1 Unblock CI where the ignores may not be working in #2040 --- pkgs/package_config/CHANGELOG.md | 2 ++ pkgs/package_config/pubspec.yaml | 2 +- pkgs/package_config/test/parse_test.dart | 44 ++++++++---------------- 3 files changed, 17 insertions(+), 31 deletions(-) diff --git a/pkgs/package_config/CHANGELOG.md b/pkgs/package_config/CHANGELOG.md index ff6e78ea6..51d9b45df 100644 --- a/pkgs/package_config/CHANGELOG.md +++ b/pkgs/package_config/CHANGELOG.md @@ -1,3 +1,5 @@ +## 2.3.0-wip + ## 2.2.0 - Add relational operators to `LanguageVersion` with extension methods diff --git a/pkgs/package_config/pubspec.yaml b/pkgs/package_config/pubspec.yaml index b29ed0b65..56eac6802 100644 --- a/pkgs/package_config/pubspec.yaml +++ b/pkgs/package_config/pubspec.yaml @@ -1,5 +1,5 @@ name: package_config -version: 2.2.0 +version: 2.3.0-wip description: Support for reading and writing Dart Package Configuration files. repository: https://github.com/dart-lang/tools/tree/main/pkgs/package_config issue_tracker: https://github.com/dart-lang/tools/labels/package%3Apackage_config diff --git a/pkgs/package_config/test/parse_test.dart b/pkgs/package_config/test/parse_test.dart index a92b9bfcc..1db51716f 100644 --- a/pkgs/package_config/test/parse_test.dart +++ b/pkgs/package_config/test/parse_test.dart @@ -111,11 +111,8 @@ void main() { "other": [42] } '''; - var config = parsePackageConfigBytes( - // ignore: unnecessary_cast - utf8.encode(packageConfigFile) as Uint8List, - Uri.parse('file:///tmp/.dart_tool/file.dart'), - throwError); + var config = parsePackageConfigBytes(utf8.encode(packageConfigFile), + Uri.parse('file:///tmp/.dart_tool/file.dart'), throwError); expect(config.version, 2); expect({for (var p in config.packages) p.name}, {'foo', 'bar', 'baz', 'noslash'}); @@ -192,11 +189,8 @@ void main() { "configVersion": 2 } '''; - var config = parsePackageConfigBytes( - // ignore: unnecessary_cast - utf8.encode(packageConfigFile) as Uint8List, - Uri.parse('file:///tmp/.dart_tool/file.dart'), - throwError); + var config = parsePackageConfigBytes(utf8.encode(packageConfigFile), + Uri.parse('file:///tmp/.dart_tool/file.dart'), throwError); expect(config.version, 2); expect({for (var p in config.packages) p.name}, {'foo', 'bar', 'baz'}); @@ -219,11 +213,8 @@ void main() { var name = '"name":"foo"'; var root = '"rootUri":"/foo/"'; test('minimal', () { - var config = parsePackageConfigBytes( - // ignore: unnecessary_cast - utf8.encode('{$cfg,$pkgs}') as Uint8List, - Uri.parse('file:///tmp/.dart_tool/file.dart'), - throwError); + var config = parsePackageConfigBytes(utf8.encode('{$cfg,$pkgs}'), + Uri.parse('file:///tmp/.dart_tool/file.dart'), throwError); expect(config.version, 2); expect(config.packages, isEmpty); }); @@ -232,7 +223,7 @@ void main() { // are optional. var config = parsePackageConfigBytes( // ignore: unnecessary_cast - utf8.encode('{$cfg,"packages":[{$name,$root}]}') as Uint8List, + utf8.encode('{$cfg,"packages":[{$name,$root}]}'), Uri.parse('file:///tmp/.dart_tool/file.dart'), throwError); expect(config.version, 2); @@ -249,8 +240,7 @@ void main() { {'name': 'qux', 'rootUri': '/foo/qux/', 'packageUri': 'lib/'}, ] })); - // ignore: unnecessary_cast - var config = parsePackageConfigBytes(configBytes as Uint8List, + var config = parsePackageConfigBytes(configBytes, Uri.parse('file:///tmp/.dart_tool/file.dart'), throwError); expect(config.version, 2); expect(config.packageOf(Uri.parse('file:///foo/lala/lala.dart'))!.name, @@ -281,8 +271,7 @@ void main() { {'name': 'qux', 'rootUri': '/qux/', 'packageUri': 'lib/'}, ] })); - // ignore: unnecessary_cast - var config = parsePackageConfigBytes(configBytes as Uint8List, + var config = parsePackageConfigBytes(configBytes, Uri.parse('file:///tmp/.dart_tool/file.dart'), throwError); expect(config.version, 2); expect( @@ -308,11 +297,8 @@ void main() { {'name': 'foo', 'rootUri': 'file:///C:/Foo/', 'packageUri': 'lib/'}, ] })); - var config = parsePackageConfigBytes( - // ignore: unnecessary_cast - configBytes as Uint8List, - Uri.parse('file:///C:/tmp/.dart_tool/file.dart'), - throwError); + var config = parsePackageConfigBytes(configBytes, + Uri.parse('file:///C:/tmp/.dart_tool/file.dart'), throwError); expect(config.version, 2); expect( config.packageOf(Uri.parse('file:///C:/foo/lala/lala.dart')), null); @@ -325,7 +311,7 @@ void main() { test(name, () { expect( // ignore: unnecessary_cast - () => parsePackageConfigBytes(utf8.encode(source) as Uint8List, + () => parsePackageConfigBytes(utf8.encode(source), Uri.parse('file:///tmp/.dart_tool/file.dart'), throwError), throwsA(isA())); }); @@ -337,8 +323,7 @@ void main() { dynamic exception; try { parsePackageConfigBytes( - // ignore: unnecessary_cast - utf8.encode(source) as Uint8List, + utf8.encode(source), Uri.parse('file:///tmp/.dart_tool/file.dart'), throwError, ); @@ -464,12 +449,11 @@ void main() { // This shouldn't be allowed, but for internal reasons it is. test('package inside package root', () { var config = parsePackageConfigBytes( - // ignore: unnecessary_cast utf8.encode( '{$cfg,"packages":[' '{"name":"foo","rootUri":"/foo/","packageUri":"lib/"},' '{"name":"bar","rootUri":"/foo/lib/bar/","packageUri":"lib"}]}', - ) as Uint8List, + ), Uri.parse('file:///tmp/.dart_tool/file.dart'), throwError); expect(