From 10394902280d7388f06ce482aed1f3e6f90c97dd Mon Sep 17 00:00:00 2001
From: Devon Carew <devoncarew@google.com>
Date: Tue, 18 Feb 2025 08:03:22 -0800
Subject: [PATCH] [deps] bring in dart-lang/i18n; update intl benchmark and sdk
 usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic0b7558fb7caf3f8d8ac9a1f460345de45d563f9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/410080
Auto-Submit: Devon Carew <devoncarew@google.com>
Reviewed-by: Moritz Sümmermann <mosum@google.com>
Commit-Queue: Devon Carew <devoncarew@google.com>
---
 DEPS                                          |  3 +++
 benchmarks/Intl/dart/format.dart              |  8 --------
 pkg/bisect_dart/lib/src/bisection_config.dart | 14 +++++++++-----
 pkg/bisect_dart/pubspec.yaml                  |  1 -
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/DEPS b/DEPS
index c670e916dfa..8807496e76a 100644
--- a/DEPS
+++ b/DEPS
@@ -135,6 +135,7 @@ vars = {
   "flute_rev": "e4ea0459a7debae5e9592c85141707b01fac86c9",
   "glob_rev": "043796be996190473b397fa2fecfa34bb91376fb",
   "http_rev": "e28f9f5ec65d83d0bfb299a78c9365cc4dc38ba1",
+  "i18n_rev": "189c2285ea523f70b688b4803b9c6b8c7c7a9dd0",
   "intl_rev": "5d65e3808ce40e6282e40881492607df4e35669f",
   "leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", # rolled manually
   "markdown_rev": "62f78c64d963ba6f73bd70ed65630dc934a264e6",
@@ -351,6 +352,8 @@ deps = {
 
   Var("dart_root") + "/third_party/pkg/http":
       Var("dart_git") + "http.git" + "@" + Var("http_rev"),
+  Var("dart_root") + "/third_party/pkg/i18n":
+      Var("dart_git") + "i18n.git" + "@" + Var("i18n_rev"),
   Var("dart_root") + "/third_party/pkg/intl":
       Var("dart_git") + "intl.git" + "@" + Var("intl_rev"),
   Var("dart_root") + "/third_party/pkg/leak_tracker":
diff --git a/benchmarks/Intl/dart/format.dart b/benchmarks/Intl/dart/format.dart
index 366fee139c6..a2a3cb72ca5 100644
--- a/benchmarks/Intl/dart/format.dart
+++ b/benchmarks/Intl/dart/format.dart
@@ -42,14 +42,6 @@ class Base extends BenchmarkBase {
         g = formatter.format(datum);
       }
     }
-
-    // TODO(devoncarew): Duplicated for golem investigation.
-    for (var datum in data) {
-      for (var formatter in formatters) {
-        g = formatter.format(datum);
-      }
-    }
-    // TODO(devoncarew): Duplicated for golem investigation.
   }
 }
 
diff --git a/pkg/bisect_dart/lib/src/bisection_config.dart b/pkg/bisect_dart/lib/src/bisection_config.dart
index dcf19e48f91..09af402ba29 100644
--- a/pkg/bisect_dart/lib/src/bisection_config.dart
+++ b/pkg/bisect_dart/lib/src/bisection_config.dart
@@ -5,7 +5,6 @@
 import 'dart:io';
 
 import 'package:cli_config/cli_config.dart';
-import 'package:intl/intl.dart';
 
 class BisectionConfig {
   /// A way to identify this bisection.
@@ -41,7 +40,7 @@ class BisectionConfig {
   static const String _failureStringKey = 'failure_string';
 
   // This will likely be extended later to support regexes.
-  Pattern get failurePattern => failureString.toPattern();
+  Pattern get failurePattern => RegExp(RegExp.escape(failureString));
 
   /// The SDK checkout to use for bisecting.
   ///
@@ -64,7 +63,7 @@ class BisectionConfig {
   factory BisectionConfig.fromConfig(Config config) {
     final testCommands = config.stringList(_testCommandsKey);
     final name = config.optionalString(_nameKey) ??
-        '${DateFormat('yyyyMMdd').format(DateTime.now())}_'
+        '${yyyyMMdd(DateTime.now())}_'
             '${testCommands.last.split(' ').last.split('/').last}';
     final sdkPath = config.optionalPath(_sdkPathKey, mustExist: true) ??
         Directory.current.uri;
@@ -158,6 +157,11 @@ $descriptions
   }
 }
 
-extension on String {
-  RegExp toPattern() => RegExp(RegExp.escape(this));
+String yyyyMMdd(DateTime date) {
+  // DateFormat('yyyyMMdd').format(date)
+  return padZero(date.year, 4) + padZero(date.month, 2) + padZero(date.day, 2);
+}
+
+String padZero(int value, int width) {
+  return value.toString().padLeft(width, '0');
 }
diff --git a/pkg/bisect_dart/pubspec.yaml b/pkg/bisect_dart/pubspec.yaml
index 11b6721bc07..71894edd89a 100644
--- a/pkg/bisect_dart/pubspec.yaml
+++ b/pkg/bisect_dart/pubspec.yaml
@@ -7,7 +7,6 @@ environment:
 
 dependencies:
   cli_config: any
-  intl: any
   logging: any
 
 dev_dependencies: