diff --git a/dev/tools/dartdoc.dart b/dev/tools/dartdoc.dart index aec5a5f4a1..b36464eeb7 100644 --- a/dev/tools/dartdoc.dart +++ b/dev/tools/dartdoc.dart @@ -581,8 +581,6 @@ Iterable libraryRefs() sync* { } void printStream(Stream> stream, { String prefix = '', List filter = const [] }) { - assert(prefix != null); - assert(filter != null); stream .transform(utf8.decoder) .transform(const LineSplitter()) diff --git a/dev/tools/gen_keycodes/lib/android_code_gen.dart b/dev/tools/gen_keycodes/lib/android_code_gen.dart index 2130aa6957..f4585746bf 100644 --- a/dev/tools/gen_keycodes/lib/android_code_gen.dart +++ b/dev/tools/gen_keycodes/lib/android_code_gen.dart @@ -31,10 +31,8 @@ class AndroidCodeGenerator extends PlatformCodeGenerator { String get _androidScanCodeMap { final StringBuffer androidScanCodeMap = StringBuffer(); for (final PhysicalKeyEntry entry in keyData.entries) { - if (entry.androidScanCodes != null) { - for (final int code in entry.androidScanCodes.cast()) { - androidScanCodeMap.writeln(' put(${toHex(code, digits: 10)}L, ${toHex(entry.usbHidCode, digits: 10)}L); // ${entry.constantName}'); - } + for (final int code in entry.androidScanCodes.cast()) { + androidScanCodeMap.writeln(' put(${toHex(code, digits: 10)}L, ${toHex(entry.usbHidCode, digits: 10)}L); // ${entry.constantName}'); } } return androidScanCodeMap.toString().trimRight(); diff --git a/dev/tools/gen_keycodes/lib/keyboard_maps_code_gen.dart b/dev/tools/gen_keycodes/lib/keyboard_maps_code_gen.dart index 20a032b65d..1224887605 100644 --- a/dev/tools/gen_keycodes/lib/keyboard_maps_code_gen.dart +++ b/dev/tools/gen_keycodes/lib/keyboard_maps_code_gen.dart @@ -144,10 +144,8 @@ class KeyboardMapsCodeGenerator extends BaseCodeGenerator { String get _androidScanCodeMap { final OutputLines lines = OutputLines('Android scancode map'); for (final PhysicalKeyEntry entry in keyData.entries) { - if (entry.androidScanCodes != null) { - for (final int code in entry.androidScanCodes) { - lines.add(code, ' $code: PhysicalKeyboardKey.${entry.constantName},'); - } + for (final int code in entry.androidScanCodes) { + lines.add(code, ' $code: PhysicalKeyboardKey.${entry.constantName},'); } } return lines.sortedJoin().trimRight(); @@ -296,9 +294,7 @@ class KeyboardMapsCodeGenerator extends BaseCodeGenerator { String get _fuchsiaHidCodeMap { final StringBuffer fuchsiaScanCodeMap = StringBuffer(); for (final PhysicalKeyEntry entry in keyData.entries) { - if (entry.usbHidCode != null) { - fuchsiaScanCodeMap.writeln(' ${toHex(entry.usbHidCode)}: PhysicalKeyboardKey.${entry.constantName},'); - } + fuchsiaScanCodeMap.writeln(' ${toHex(entry.usbHidCode)}: PhysicalKeyboardKey.${entry.constantName},'); } return fuchsiaScanCodeMap.toString().trimRight(); } @@ -328,9 +324,7 @@ class KeyboardMapsCodeGenerator extends BaseCodeGenerator { String get _webNumpadMap { final OutputLines lines = OutputLines('Web numpad map'); for (final LogicalKeyEntry entry in _numpadLogicalKeyData) { - if (entry.name != null) { - lines.add(entry.name, " '${entry.name}': LogicalKeyboardKey.${entry.constantName},"); - } + lines.add(entry.name, " '${entry.name}': LogicalKeyboardKey.${entry.constantName},"); } return lines.sortedJoin().trimRight(); } diff --git a/dev/tools/gen_keycodes/lib/utils.dart b/dev/tools/gen_keycodes/lib/utils.dart index 1717712c74..802dd69ff8 100644 --- a/dev/tools/gen_keycodes/lib/utils.dart +++ b/dev/tools/gen_keycodes/lib/utils.dart @@ -153,9 +153,6 @@ String wrapString(String input, {required String prefix}) { /// /// An null list is considered a list with length 0. void zipStrict(Iterable list1, Iterable list2, void Function(T1, T2) fn) { - if (list1 == null && list2 == null) { - return; - } assert(list1.length == list2.length); final Iterator it1 = list1.iterator; final Iterator it2 = list2.iterator; diff --git a/dev/tools/localization/bin/gen_localizations.dart b/dev/tools/localization/bin/gen_localizations.dart index 30d627088c..d8c100c2a9 100644 --- a/dev/tools/localization/bin/gen_localizations.dart +++ b/dev/tools/localization/bin/gen_localizations.dart @@ -71,12 +71,8 @@ String generateArbBasedLocalizationSubclasses({ required String supportedLanguagesConstant, required String supportedLanguagesDocMacro, }) { - assert(localeToResources != null); - assert(localeToResourceAttributes != null); assert(generatedClassPrefix.isNotEmpty); assert(baseClass.isNotEmpty); - assert(generateHeader != null); - assert(generateConstructor != null); assert(factoryName.isNotEmpty); assert(factoryDeclaration.isNotEmpty); assert(factoryArguments.isNotEmpty); diff --git a/dev/tools/localization/localizations_utils.dart b/dev/tools/localization/localizations_utils.dart index 67abed175b..0959e16e00 100644 --- a/dev/tools/localization/localizations_utils.dart +++ b/dev/tools/localization/localizations_utils.dart @@ -51,7 +51,7 @@ class LocaleInfo implements Comparable { scriptCode = codes[1].length > codes[2].length ? codes[1] : codes[2]; countryCode = codes[1].length < codes[2].length ? codes[1] : codes[2]; } - assert(codes[0] != null && codes[0].isNotEmpty); + assert(codes[0].isNotEmpty); assert(countryCode == null || countryCode.isNotEmpty); assert(scriptCode == null || scriptCode.isNotEmpty); @@ -151,10 +151,6 @@ void loadMatchingArbsIntoBundleMaps({ required Map> localeToResources, required Map> localeToResourceAttributes, }) { - assert(directory != null); - assert(filenamePattern != null); - assert(localeToResources != null); - assert(localeToResourceAttributes != null); /// Set that holds the locales that were assumed from the existing locales. /// @@ -214,7 +210,6 @@ void loadMatchingArbsIntoBundleMaps({ } void exitWithError(String errorMessage) { - assert(errorMessage != null); stderr.writeln('fatal: $errorMessage'); exit(1); } diff --git a/dev/tools/vitool/test/vitool_test.dart b/dev/tools/vitool/test/vitool_test.dart index a5491e9c1b..3198f82ee9 100644 --- a/dev/tools/vitool/test/vitool_test.dart +++ b/dev/tools/vitool/test/vitool_test.dart @@ -614,7 +614,7 @@ class PathMatcher extends Matcher { @override bool matches(dynamic item, Map matchState) { - if (item == null || actual == null) { + if (item == null) { return item == actual; } @@ -666,7 +666,7 @@ class PathAnimationMatcher extends Matcher { @override bool matches(dynamic item, Map matchState) { - if (item == null || expected == null) { + if (item == null) { return item == expected; }