Skip to content

Commit a5c9ff3

Browse files
committed
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
1 parent 920fdb6 commit a5c9ff3

File tree

3 files changed

+17
-31
lines changed

3 files changed

+17
-31
lines changed

pkgs/package_config/CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## 2.3.0-wip
2+
13
## 2.2.0
24

35
- Add relational operators to `LanguageVersion` with extension methods

pkgs/package_config/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: package_config
2-
version: 2.2.0
2+
version: 2.3.0-wip
33
description: Support for reading and writing Dart Package Configuration files.
44
repository: https://github.com/dart-lang/tools/tree/main/pkgs/package_config
55
issue_tracker: https://github.com/dart-lang/tools/labels/package%3Apackage_config

pkgs/package_config/test/parse_test.dart

+14-30
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,8 @@ void main() {
111111
"other": [42]
112112
}
113113
''';
114-
var config = parsePackageConfigBytes(
115-
// ignore: unnecessary_cast
116-
utf8.encode(packageConfigFile) as Uint8List,
117-
Uri.parse('file:///tmp/.dart_tool/file.dart'),
118-
throwError);
114+
var config = parsePackageConfigBytes(utf8.encode(packageConfigFile),
115+
Uri.parse('file:///tmp/.dart_tool/file.dart'), throwError);
119116
expect(config.version, 2);
120117
expect({for (var p in config.packages) p.name},
121118
{'foo', 'bar', 'baz', 'noslash'});
@@ -192,11 +189,8 @@ void main() {
192189
"configVersion": 2
193190
}
194191
''';
195-
var config = parsePackageConfigBytes(
196-
// ignore: unnecessary_cast
197-
utf8.encode(packageConfigFile) as Uint8List,
198-
Uri.parse('file:///tmp/.dart_tool/file.dart'),
199-
throwError);
192+
var config = parsePackageConfigBytes(utf8.encode(packageConfigFile),
193+
Uri.parse('file:///tmp/.dart_tool/file.dart'), throwError);
200194
expect(config.version, 2);
201195
expect({for (var p in config.packages) p.name}, {'foo', 'bar', 'baz'});
202196

@@ -219,11 +213,8 @@ void main() {
219213
var name = '"name":"foo"';
220214
var root = '"rootUri":"/foo/"';
221215
test('minimal', () {
222-
var config = parsePackageConfigBytes(
223-
// ignore: unnecessary_cast
224-
utf8.encode('{$cfg,$pkgs}') as Uint8List,
225-
Uri.parse('file:///tmp/.dart_tool/file.dart'),
226-
throwError);
216+
var config = parsePackageConfigBytes(utf8.encode('{$cfg,$pkgs}'),
217+
Uri.parse('file:///tmp/.dart_tool/file.dart'), throwError);
227218
expect(config.version, 2);
228219
expect(config.packages, isEmpty);
229220
});
@@ -232,7 +223,7 @@ void main() {
232223
// are optional.
233224
var config = parsePackageConfigBytes(
234225
// ignore: unnecessary_cast
235-
utf8.encode('{$cfg,"packages":[{$name,$root}]}') as Uint8List,
226+
utf8.encode('{$cfg,"packages":[{$name,$root}]}'),
236227
Uri.parse('file:///tmp/.dart_tool/file.dart'),
237228
throwError);
238229
expect(config.version, 2);
@@ -249,8 +240,7 @@ void main() {
249240
{'name': 'qux', 'rootUri': '/foo/qux/', 'packageUri': 'lib/'},
250241
]
251242
}));
252-
// ignore: unnecessary_cast
253-
var config = parsePackageConfigBytes(configBytes as Uint8List,
243+
var config = parsePackageConfigBytes(configBytes,
254244
Uri.parse('file:///tmp/.dart_tool/file.dart'), throwError);
255245
expect(config.version, 2);
256246
expect(config.packageOf(Uri.parse('file:///foo/lala/lala.dart'))!.name,
@@ -281,8 +271,7 @@ void main() {
281271
{'name': 'qux', 'rootUri': '/qux/', 'packageUri': 'lib/'},
282272
]
283273
}));
284-
// ignore: unnecessary_cast
285-
var config = parsePackageConfigBytes(configBytes as Uint8List,
274+
var config = parsePackageConfigBytes(configBytes,
286275
Uri.parse('file:///tmp/.dart_tool/file.dart'), throwError);
287276
expect(config.version, 2);
288277
expect(
@@ -308,11 +297,8 @@ void main() {
308297
{'name': 'foo', 'rootUri': 'file:///C:/Foo/', 'packageUri': 'lib/'},
309298
]
310299
}));
311-
var config = parsePackageConfigBytes(
312-
// ignore: unnecessary_cast
313-
configBytes as Uint8List,
314-
Uri.parse('file:///C:/tmp/.dart_tool/file.dart'),
315-
throwError);
300+
var config = parsePackageConfigBytes(configBytes,
301+
Uri.parse('file:///C:/tmp/.dart_tool/file.dart'), throwError);
316302
expect(config.version, 2);
317303
expect(
318304
config.packageOf(Uri.parse('file:///C:/foo/lala/lala.dart')), null);
@@ -325,7 +311,7 @@ void main() {
325311
test(name, () {
326312
expect(
327313
// ignore: unnecessary_cast
328-
() => parsePackageConfigBytes(utf8.encode(source) as Uint8List,
314+
() => parsePackageConfigBytes(utf8.encode(source),
329315
Uri.parse('file:///tmp/.dart_tool/file.dart'), throwError),
330316
throwsA(isA<FormatException>()));
331317
});
@@ -337,8 +323,7 @@ void main() {
337323
dynamic exception;
338324
try {
339325
parsePackageConfigBytes(
340-
// ignore: unnecessary_cast
341-
utf8.encode(source) as Uint8List,
326+
utf8.encode(source),
342327
Uri.parse('file:///tmp/.dart_tool/file.dart'),
343328
throwError,
344329
);
@@ -464,12 +449,11 @@ void main() {
464449
// This shouldn't be allowed, but for internal reasons it is.
465450
test('package inside package root', () {
466451
var config = parsePackageConfigBytes(
467-
// ignore: unnecessary_cast
468452
utf8.encode(
469453
'{$cfg,"packages":['
470454
'{"name":"foo","rootUri":"/foo/","packageUri":"lib/"},'
471455
'{"name":"bar","rootUri":"/foo/lib/bar/","packageUri":"lib"}]}',
472-
) as Uint8List,
456+
),
473457
Uri.parse('file:///tmp/.dart_tool/file.dart'),
474458
throwError);
475459
expect(

0 commit comments

Comments
 (0)