Use sorted from package:collection instead of custom util function (#4516)

Author: parlough

lib/src/ascii_tree.dart

@@ -8,6 +8,7 @@ library;
 
 import 'dart:io';
 
+import 'package:collection/collection.dart';
 import 'package:path/path.dart' as p;
 
 import 'log.dart' as log;
@@ -165,7 +166,7 @@ void _draw(
   if (name != null) _drawLine(buffer, prefix, isLast, name, depth <= 1);
 
   // Recurse to the children.
-  final childNames = ordered(children.keys);
+  final childNames = children.keys.sorted();
 
   void drawChild(bool isLastChild, String child) {
     final childPrefix = _getPrefix(depth <= 1, isLast);

lib/src/command/deps.dart

@@ -5,6 +5,8 @@
 import 'dart:collection';
 import 'dart:convert';
 
+import 'package:collection/collection.dart';
+
 import '../ascii_tree.dart' as tree;
 import '../command.dart';
 import '../command_runner.dart';
@@ -243,7 +245,7 @@ class DepsCommand extends PubCommand {
 
     buffer.writeln();
     buffer.writeln('$section:');
-    for (var name in ordered(names)) {
+    for (var name in names.sorted()) {
       final package = await _getPackage(name);
 
       buffer.write('- ${_labelPackage(package)}');
@@ -291,7 +293,7 @@ class DepsCommand extends PubCommand {
 
     await _outputListSection(
       'transitive dependencies',
-      ordered(transitive),
+      transitive.sorted(),
       buffer,
     );
   }

lib/src/entrypoint.dart

@@ -7,6 +7,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
 
+import 'package:collection/collection.dart';
 import 'package:path/path.dart' as p;
 import 'package:pool/pool.dart';
 import 'package:pub_semver/pub_semver.dart';
@@ -436,7 +437,7 @@ See $workspacesDocUrl for more information.''',
     final entries = <PackageConfigEntry>[];
     if (lockFile.packages.isNotEmpty) {
       final relativeFromPath = p.join(workspaceRoot.dir, '.dart_tool');
-      for (final name in ordered(lockFile.packages.keys)) {
+      for (final name in lockFile.packages.keys.sorted()) {
         final id = lockFile.packages[name]!;
         final rootPath = cache.getDirectory(id, relativeFrom: relativeFromPath);
         final pubspec = await cache.describe(id);

lib/src/global_packages.dart

@@ -5,6 +5,7 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:collection/collection.dart';
 import 'package:path/path.dart' as p;
 import 'package:pub_semver/pub_semver.dart';
 
@@ -767,7 +768,7 @@ Try reactivating the package.
 
     final installed = <String>[];
     final collided = <String, String>{};
-    final allExecutables = ordered(package.pubspec.executables.keys);
+    final allExecutables = package.pubspec.executables.keys.sorted();
     for (var executable in allExecutables) {
       if (executables != null && !executables.contains(executable)) continue;
 
@@ -799,7 +800,7 @@ Try reactivating the package.
 
     // Show errors for any collisions.
     if (collided.isNotEmpty) {
-      for (var command in ordered(collided.keys)) {
+      for (var command in collided.keys.sorted()) {
         if (overwriteBinStubs) {
           log.warning('Replaced ${log.bold(command)} previously installed from '
               '${log.bold(collided[command].toString())}.');
@@ -817,10 +818,9 @@ Try reactivating the package.
 
     // Show errors for any unknown executables.
     if (executables != null) {
-      final unknown = ordered(
-        executables
-            .where((exe) => !package.pubspec.executables.keys.contains(exe)),
-      );
+      final unknown = executables
+          .where((exe) => !package.pubspec.executables.keys.contains(exe))
+          .sorted();
       if (unknown.isNotEmpty) {
         dataError("Unknown ${namedSequence('executable', unknown)}.");
       }

lib/src/package.dart

@@ -98,21 +98,23 @@ class Package {
   /// This includes regular, dev dependencies, and overrides from this package.
   Map<String, PackageRange> get immediateDependencies {
     // Make sure to add overrides last so they replace normal dependencies.
-    return {}
-      ..addAll(dependencies)
-      ..addAll(devDependencies)
-      ..addAll(pubspec.dependencyOverrides);
+    return {
+      ...dependencies,
+      ...devDependencies,
+      ...pubspec.dependencyOverrides,
+    };
   }
 
-  /// Returns a list of paths to all Dart executables in this package's bin
-  /// directory.
+  /// Returns a list of paths to all Dart executables in
+  /// this package's `bin` directory.
   List<String> get executablePaths {
     final binDir = p.join(dir, 'bin');
     if (!dirExists(binDir)) return <String>[];
-    return ordered(listDir(p.join(dir, 'bin'), includeDirs: false))
-        .where((executable) => p.extension(executable) == '.dart')
-        .map((executable) => p.relative(executable, from: dir))
-        .toList();
+    return [
+      for (var executable in listDir(binDir, includeDirs: false))
+        if (p.extension(executable) == '.dart')
+          p.relative(executable, from: dir),
+    ]..sort();
   }
 
   List<String> get executableNames =>

lib/src/solver/package_lister.dart

@@ -318,7 +318,7 @@ class PackageLister {
     final lower = await _dependencyBounds(dependencies, index, upper: false);
     final upper = await _dependencyBounds(dependencies, index);
 
-    return ordered(dependencies.keys).map((package) {
+    return dependencies.keys.sorted().map((package) {
       final constraint = VersionRange(
         min: lower[package],
         includeMin: true,

lib/src/solver/report.dart

@@ -2,6 +2,7 @@
 // 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:path/path.dart' as p;
 import 'package:pub_semver/pub_semver.dart';
 
@@ -225,7 +226,7 @@ $contentHashesDocumentationUrl
     removed.remove(_rootPubspec.name); // Never consider root.
     if (removed.isNotEmpty) {
       output.writeln('These packages are no longer being depended on:');
-      for (var name in ordered(removed)) {
+      for (var name in removed.sorted()) {
         await _reportPackage(name, output, alwaysShow: true);
         changes += 1;
       }

lib/src/utils.dart

@@ -258,13 +258,6 @@ bool isLoopback(String host) {
   return InternetAddress.tryParse(host)?.isLoopback ?? false;
 }
 
-/// Returns a list containing the sorted elements of [iter].
-List<T> ordered<T extends Comparable<T>>(Iterable<T> iter) {
-  final list = iter.toList();
-  list.sort();
-  return list;
-}
-
 /// Given a list of filenames, returns a set of patterns that can be used to
 /// filter for those filenames.
 ///