Bump collection to c90b19f07b48391f3b1b4c39dd06ef0177f8e07c

Changes: ``` > git log --format="%C(auto) %h %s" 141d83a..c90b19f https://dart.googlesource.com/collection.git/+/c90b19f blast_repo fixes (348) https://dart.googlesource.com/collection.git/+/a1d2507 Add flattenedToList and flattenedToSet (328) https://dart.googlesource.com/collection.git/+/e9219c7 Deprecate whereNotNull from IterableNullableExtensions (332) https://dart.googlesource.com/collection.git/+/9e441f1 Deprecate transitiveClosure (336) ``` Diff: https://dart.googlesource.com/collection.git/+/141d83af3d7586ae9d27de610fd426071c98e5d3..c90b19f07b48391f3b1b4c39dd06ef0177f8e07c/ Change-Id: I9ed24345c132ad92ae65c5e70ab37647fad0ec00 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/370960 Reviewed-by: Nate Bosch <[email protected]> Commit-Queue: Devon Carew <[email protected]>
dart-lang · Jun 11, 2024 · f97004f · f97004f
1 parent 45835b0
commit f97004f
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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<Annotation>();
     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
@@ -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
@@ -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<String> 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
@@ -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