From e711a61a7b090b18408c926df854febcbaf3034d Mon Sep 17 00:00:00 2001 From: Martin Kustermann Date: Thu, 29 Jun 2023 19:27:49 +0200 Subject: [PATCH] Prepare for utf8.encode() to return more precise Uint8List type (#43335) To avoid analyzer warnings when utf8.encode() will return the more precise Uint8List type, we use const Utf8Encoder().convert() which already returns Uint8List See https://github.com/dart-lang/sdk/issues/52801 --- lib/web_ui/test/canvaskit/fragment_program_test.dart | 2 +- lib/web_ui/test/engine/channel_buffers_test.dart | 2 +- testing/dart/channel_buffers_test.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/web_ui/test/canvaskit/fragment_program_test.dart b/lib/web_ui/test/canvaskit/fragment_program_test.dart index f0ef8c66c0de1..1907093f5a75c 100644 --- a/lib/web_ui/test/canvaskit/fragment_program_test.dart +++ b/lib/web_ui/test/canvaskit/fragment_program_test.dart @@ -186,7 +186,7 @@ void testMain() { }); test('FragmentProgram can be created from JSON IPLR bundle', () { - final Uint8List data = utf8.encode(kJsonIPLR) as Uint8List; + final Uint8List data = const Utf8Encoder().convert(kJsonIPLR); final CkFragmentProgram program = CkFragmentProgram.fromBytes('test', data); expect(program.effect, isNotNull); diff --git a/lib/web_ui/test/engine/channel_buffers_test.dart b/lib/web_ui/test/engine/channel_buffers_test.dart index 6fc91100aec92..2cd8cd2baa7d4 100644 --- a/lib/web_ui/test/engine/channel_buffers_test.dart +++ b/lib/web_ui/test/engine/channel_buffers_test.dart @@ -23,7 +23,7 @@ void main() { } ByteData _makeByteData(String str) { - final Uint8List list = utf8.encode(str) as Uint8List; + final Uint8List list = const Utf8Encoder().convert(str); final ByteBuffer buffer = list.buffer; return ByteData.view(buffer); } diff --git a/testing/dart/channel_buffers_test.dart b/testing/dart/channel_buffers_test.dart index 4058719d5f996..a35f84207e49f 100644 --- a/testing/dart/channel_buffers_test.dart +++ b/testing/dart/channel_buffers_test.dart @@ -12,7 +12,7 @@ import 'dart:ui' as ui; import 'package:litetest/litetest.dart'; ByteData _makeByteData(String str) { - final Uint8List list = utf8.encode(str) as Uint8List; + final Uint8List list = const Utf8Encoder().convert(str); final ByteBuffer buffer = list.buffer; return ByteData.view(buffer); }