Remove custom hashList(…)

JonasWanke · Jun 17, 2022 · 81952b0 · 81952b0
1 parent ccc2828
commit 81952b0
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 37 deletions.
diff --git a/lib/src/by_week_day_entry.dart b/lib/src/by_week_day_entry.dart
@@ -28,7 +28,7 @@ class ByWeekDayEntry implements Comparable<ByWeekDayEntry> {
   }
 
   @override
-  int get hashCode => hashList([day, occurrence]);
+  int get hashCode => Object.hash(day, occurrence);
 
   @override
   bool operator ==(Object other) {

diff --git a/lib/src/cache.dart b/lib/src/cache.dart
@@ -1,7 +1,5 @@
 import 'package:meta/meta.dart';
 
-import 'utils.dart';
-
 @immutable
 class CacheKey {
   const CacheKey({
@@ -19,15 +17,8 @@ class CacheKey {
   final bool includeBefore;
 
   @override
-  int get hashCode {
-    return hashList([
-      start,
-      after,
-      includeAfter,
-      before,
-      includeBefore,
-    ]);
-  }
+  int get hashCode =>
+      Object.hash(start, after, includeAfter, before, includeBefore);
 
   @override
   bool operator ==(Object other) {

diff --git a/lib/src/codecs/string/ical.dart b/lib/src/codecs/string/ical.dart
@@ -4,8 +4,6 @@ import 'package:collection/collection.dart';
 import 'package:intl/intl.dart';
 import 'package:meta/meta.dart';
 
-import '../../utils.dart';
-
 /// Pattern corresponding to the `DATE` rule specified in
 /// [RFC 5545 Section 3.3.4: Date](https://tools.ietf.org/html/rfc5545#section-3.3.4).
 final iCalDatePattern = DateFormat('yyyyMMdd');
@@ -42,7 +40,7 @@ class ICalProperty {
   final String value;
 
   @override
-  int get hashCode => hashList([name, parameters, value]);
+  int get hashCode => Object.hash(name, parameters, value);
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) {

diff --git a/lib/src/recurrence_rule.dart b/lib/src/recurrence_rule.dart
@@ -245,7 +245,7 @@ class RecurrenceRule {
 
   @override
   int get hashCode {
-    return hashList([
+    return Object.hash(
       frequency,
       until,
       count,
@@ -259,7 +259,7 @@ class RecurrenceRule {
       byWeeks,
       byMonths,
       bySetPositions,
-    ]);
+    );
   }
 
   @override

diff --git a/lib/src/utils.dart b/lib/src/utils.dart
@@ -4,25 +4,6 @@ import 'package:time/time.dart';
 
 export 'utils/week.dart';
 
-/// Combines the [Object.hashCode] values of an arbitrary number of objects
-/// from an [Iterable] into one value. This function will return the same
-/// value if given `null` as if given an empty list.
-// Borrowed from dart:ui.
-int hashList(Iterable<Object?>? arguments) {
-  var result = 0;
-  if (arguments != null) {
-    for (final argument in arguments) {
-      var hash = result;
-      hash = 0x1fffffff & (hash + argument.hashCode);
-      hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
-      result = hash ^ (hash >> 6);
-    }
-  }
-  result = 0x1fffffff & (result + ((0x03ffffff & result) << 3));
-  result = result ^ (result >> 11);
-  return 0x1fffffff & (result + ((0x00003fff & result) << 15));
-}
-
 extension DateTimeRrule on DateTime {
   DateTime copyWith({
     int? year,

diff --git a/lib/src/utils/week.dart b/lib/src/utils/week.dart
@@ -67,7 +67,7 @@ class WeekInfo implements Comparable<WeekInfo> {
   }
 
   @override
-  int get hashCode => hashList([weekBasedYear, weekOfYear]);
+  int get hashCode => Object.hash(weekBasedYear, weekOfYear);
 
   @override
   bool operator ==(Object other) {