diff --git a/DEPS b/DEPS index 0ab1fd3b3790..d19f707efe0b 100644 --- a/DEPS +++ b/DEPS @@ -129,7 +129,7 @@ vars = { "characters_rev": "7633a16a22c626e19ca750223237396315268a06", "cli_util_rev": "c37d5e14f50e72a268c1ad86149cecfa4b58c494", "clock_rev": "7cbf08e36a92f14f22132d255846610c1b065324", - "collection_rev": "141d83af3d7586ae9d27de610fd426071c98e5d3", + "collection_rev": "c90b19f07b48391f3b1b4c39dd06ef0177f8e07c", "convert_rev": "70940e3728f34d897ad92f44f98db2d47286b090", "crypto_rev": "7a9428a78962783f6081dc42465ed580cff225ca", "csslib_rev": "23c314bb6b247a71348cfb0987ba0eb29574abb6", diff --git a/pkg/analysis_server/test/lsp/code_actions_abstract.dart b/pkg/analysis_server/test/lsp/code_actions_abstract.dart index 24ea6a82a982..2970cf78d6d0 100644 --- a/pkg/analysis_server/test/lsp/code_actions_abstract.dart +++ b/pkg/analysis_server/test/lsp/code_actions_abstract.dart @@ -114,7 +114,7 @@ abstract class AbstractCodeActionsTest extends AbstractLspAnalysisServerTest { } return action; }) - .whereNotNull() + .nonNulls .toList(); } diff --git a/pkg/analysis_server/test/lsp/server_abstract.dart b/pkg/analysis_server/test/lsp/server_abstract.dart index 3175d620a9d3..d9db07e9e836 100644 --- a/pkg/analysis_server/test/lsp/server_abstract.dart +++ b/pkg/analysis_server/test/lsp/server_abstract.dart @@ -190,7 +190,7 @@ abstract class AbstractLspAnalysisServerTest (textDocEdit) => textDocEdit, ), ) - .whereNotNull() + .nonNulls .toList(); @override diff --git a/pkg/analyzer/tool/summary/mini_ast.dart b/pkg/analyzer/tool/summary/mini_ast.dart index 21b41c07dbba..5f93c5e7b77b 100644 --- a/pkg/analyzer/tool/summary/mini_ast.dart +++ b/pkg/analyzer/tool/summary/mini_ast.dart @@ -12,7 +12,6 @@ import 'package:_fe_analyzer_shared/src/parser/parser.dart'; import 'package:_fe_analyzer_shared/src/parser/stack_listener.dart'; import 'package:_fe_analyzer_shared/src/scanner/token.dart'; import 'package:analyzer/src/dart/analysis/experiments.dart'; -import 'package:collection/collection.dart'; import 'package:pub_semver/pub_semver.dart'; /// "Mini AST" representation of a declaration which can accept annotations. @@ -433,8 +432,8 @@ class MiniAstBuilder extends StackListener { var name = pop() as String; var metadata = popTypedList(); var comment = pop() as Comment?; - compilationUnit.declarations.add(EnumDeclaration( - comment, metadata, name, constants.whereNotNull().toList())); + compilationUnit.declarations.add( + EnumDeclaration(comment, metadata, name, constants.nonNulls.toList())); } @override diff --git a/pkg/dds/test/dap/integration/dart_test_test.dart b/pkg/dds/test/dap/integration/dart_test_test.dart index 3d15b82ee6a3..805652d570b1 100644 --- a/pkg/dds/test/dap/integration/dart_test_test.dart +++ b/pkg/dds/test/dap/integration/dart_test_test.dart @@ -2,7 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:collection/collection.dart'; import 'package:dap/dap.dart'; import 'package:test/test.dart'; @@ -114,7 +113,7 @@ main() { // Collect paths from any OutputEvents that had them. final stackFramePaths = outputEvents.output .map((event) => event.source?.path) - .whereNotNull() + .nonNulls .toList(); // Ensure we had a frame with the absolute path of the test script. expect(stackFramePaths, contains(testFile.path)); diff --git a/pkg/sourcemap_testing/lib/src/stepping_helper.dart b/pkg/sourcemap_testing/lib/src/stepping_helper.dart index 4bf6fe2ef6fa..b3a066f00f3d 100644 --- a/pkg/sourcemap_testing/lib/src/stepping_helper.dart +++ b/pkg/sourcemap_testing/lib/src/stepping_helper.dart @@ -3,7 +3,6 @@ import 'dart:ffi' show Abi; import 'dart:io'; import 'package:_fe_analyzer_shared/src/testing/annotated_code_helper.dart'; -import 'package:collection/collection.dart' show IterableNullableExtension; import 'package:dart2js_tools/src/util.dart'; import 'package:expect/minitest.dart'; // ignore: deprecated_member_use import 'package:path/path.dart' as path; @@ -430,7 +429,7 @@ ProcessResult _runD8(String outInspectorPath, List scriptD8Command, ...scriptD8Command, '--', debugAction, - ...breakpoints.whereNotNull() + ...breakpoints.nonNulls ]); if (runResult.exitCode != 0) { print(runResult.stderr); diff --git a/pkg/sourcemap_testing/pubspec.yaml b/pkg/sourcemap_testing/pubspec.yaml index d7392767774f..a4e853465821 100644 --- a/pkg/sourcemap_testing/pubspec.yaml +++ b/pkg/sourcemap_testing/pubspec.yaml @@ -4,12 +4,11 @@ name: sourcemap_testing publish_to: none environment: - sdk: '>=2.16.0 <3.0.0' + sdk: ^3.0.0 # Use 'any' constraints here; we get our versions from the DEPS file. dependencies: _fe_analyzer_shared: any - collection: any dart2js_tools: any expect: any path: any