Audit hashCode overrides outside of packages/flutter (flutter#85370)

dnfield · web-flow · commit 9846fa5145f6 · 2021-06-26T17:36:04.000-07:00
diff --git a/dev/bots/analyze.dart b/dev/bots/analyze.dart
@@ -610,7 +610,7 @@ class Hash256 {
   }
 
   @override
-  int get hashCode => a ^ b ^ c ^ d;
+  int get hashCode => Object.hash(a, b, c, d);
 }
 
 // DO NOT ADD ANY ENTRIES TO THIS LIST.
diff --git a/dev/devicelab/lib/framework/running_processes.dart b/dev/devicelab/lib/framework/running_processes.dart
@@ -28,20 +28,7 @@ class RunningProcessInfo {
   }
 
   @override
-  int get hashCode {
-    // TODO(dnfield): Replace this when Object.hashValues lands, https://github.com/dart-lang/sdk/issues/11617
-    int hash = 17;
-    if (pid != null) {
-      hash = hash * 23 + pid.hashCode;
-    }
-    if (commandLine != null) {
-      hash = hash * 23 + commandLine.hashCode;
-    }
-    if (creationDate != null) {
-      hash = hash * 23 + creationDate.hashCode;
-    }
-    return hash;
-  }
+  int get hashCode => Object.hash(pid, commandLine, creationDate);
 
   @override
   String toString() {
diff --git a/dev/devicelab/test/adb_test.dart b/dev/devicelab/test/adb_test.dart
@@ -166,15 +166,14 @@ class CommandArgs {
   }
 
   @override
-  int get hashCode => 17 * (17 * command.hashCode + _hashArguments) + _hashEnvironment;
-
-  int get _hashArguments => arguments != null
-    ? const ListEquality<String>().hash(arguments)
-    : null.hashCode;
-
-  int get _hashEnvironment => environment != null
-    ? const MapEquality<String, String>().hash(environment)
-    : null.hashCode;
+  int get hashCode {
+    return Object.hash(
+      command,
+      Object.hashAll(arguments ?? const <String>[]),
+      Object.hashAllUnordered(environment?.keys ?? const <String>[]),
+      Object.hashAllUnordered(environment?.values ?? const <String>[]),
+    );
+  }
 }
 
 class FakeDevice extends AndroidDevice {
diff --git a/dev/integration_tests/android_semantics_testing/lib/src/common.dart b/dev/integration_tests/android_semantics_testing/lib/src/common.dart
@@ -183,8 +183,7 @@ class Rect {
   final double bottom;
 
   @override
-  int get hashCode =>
-      top.hashCode ^ left.hashCode ^ right.hashCode ^ bottom.hashCode;
+  int get hashCode => Object.hash(top, left, right, bottom);
 
   @override
   bool operator ==(Object other) {
@@ -216,7 +215,7 @@ class Size {
   final double height;
 
   @override
-  int get hashCode => width.hashCode ^ height.hashCode;
+  int get hashCode => Object.hash(width, height);
 
   @override
   bool operator ==(Object other) {
diff --git a/dev/tools/localization/localizations_utils.dart b/dev/tools/localization/localizations_utils.dart
@@ -128,9 +128,7 @@ class LocaleInfo implements Comparable<LocaleInfo> {
   }
 
   @override
-  int get hashCode {
-    return originalString.hashCode;
-  }
+  int get hashCode => originalString.hashCode;
 
   @override
   String toString() {
diff --git a/dev/tools/vitool/lib/vitool.dart b/dev/tools/vitool/lib/vitool.dart
@@ -274,7 +274,7 @@ class FrameData {
   }
 
   @override
-  int get hashCode => size.hashCode ^ paths.hashCode;
+  int get hashCode => Object.hash(size, Object.hashAll(paths));
 
   @override
   String toString() {
@@ -328,7 +328,7 @@ class SvgPath {
   }
 
   @override
-  int get hashCode => id.hashCode ^ commands.hashCode ^ opacity.hashCode;
+  int get hashCode => Object.hash(id, Object.hashAll(commands), opacity);
 
   @override
   String toString() {
@@ -377,7 +377,7 @@ class SvgPathCommand {
   }
 
   @override
-  int get hashCode => type.hashCode ^ points.hashCode;
+  int get hashCode => Object.hash(type, Object.hashAll(points));
 
   @override
   String toString() {
diff --git a/packages/flutter/lib/src/material/about.dart b/packages/flutter/lib/src/material/about.dart
@@ -798,7 +798,7 @@ class _DetailArguments {
   }
 
   @override
-  int get hashCode => packageName.hashCode; // Good enough.
+  int get hashCode => hashValues(packageName, hashList(licenseEntries));
 }
 
 class _PackageLicensePage extends StatefulWidget {
diff --git a/packages/flutter_driver/lib/src/driver/driver.dart b/packages/flutter_driver/lib/src/driver/driver.dart
@@ -814,5 +814,5 @@ class DriverOffset {
   }
 
   @override
-  int get hashCode => dx.hashCode ^ dy.hashCode;
+  int get hashCode => Object.hash(dx, dy);
 }
diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
@@ -911,11 +911,7 @@ class _Asset {
   }
 
   @override
-  int get hashCode {
-    return baseDir.hashCode
-        ^ relativeUri.hashCode
-        ^ entryUri.hashCode;
-  }
+  int get hashCode => Object.hash(baseDir, relativeUri, entryUri.hashCode);
 }
 
 // Given an assets directory like this:
diff --git a/packages/flutter_tools/lib/src/base/fingerprint.dart b/packages/flutter_tools/lib/src/base/fingerprint.dart
@@ -128,10 +128,7 @@ class Fingerprint {
   }
 
   @override
-  // Ignore map entries here to avoid becoming inconsistent with equals
-  // due to differences in map entry order. This is a really bad hash
-  // function and should eventually be deprecated and removed.
-  int get hashCode => _checksums.length.hashCode;
+  int get hashCode => Object.hash(Object.hashAllUnordered(_checksums.keys), Object.hashAllUnordered(_checksums.values));
 
   @override
   String toString() => '{checksums: $_checksums}';
diff --git a/packages/flutter_tools/lib/src/base/version.dart b/packages/flutter_tools/lib/src/base/version.dart
@@ -98,7 +98,7 @@ class Version implements Comparable<Version> {
   }
 
   @override
-  int get hashCode => major ^ minor ^ patch;
+  int get hashCode => Object.hash(major, minor, patch);
 
   bool operator <(Version other) => compareTo(other) < 0;
   bool operator >(Version other) => compareTo(other) > 0;
diff --git a/packages/flutter_tools/lib/src/doctor_validator.dart b/packages/flutter_tools/lib/src/doctor_validator.dart
@@ -278,7 +278,7 @@ class ValidationMessage {
   }
 
   @override
-  int get hashCode => type.hashCode ^ message.hashCode ^ contextUrl.hashCode;
+  int get hashCode => Object.hash(type, message, contextUrl);
 }
 
 class NoIdeValidator extends DoctorValidator {
diff --git a/packages/flutter_tools/lib/src/ios/xcodeproj.dart b/packages/flutter_tools/lib/src/ios/xcodeproj.dart
@@ -302,7 +302,7 @@ class XcodeProjectBuildContext {
   final EnvironmentType environmentType;
 
   @override
-  int get hashCode => scheme.hashCode ^ configuration.hashCode ^ environmentType.hashCode;
+  int get hashCode => Object.hash(scheme, configuration, environmentType);
 
   @override
   bool operator ==(Object other) {
diff --git a/packages/flutter_tools/lib/src/localizations/localizations_utils.dart b/packages/flutter_tools/lib/src/localizations/localizations_utils.dart
@@ -129,9 +129,7 @@ class LocaleInfo implements Comparable<LocaleInfo> {
   }
 
   @override
-  int get hashCode {
-    return originalString.hashCode;
-  }
+  int get hashCode => originalString.hashCode;
 
   @override
   String toString() {
diff --git a/packages/flutter_tools/lib/src/reporting/custom_dimensions.dart b/packages/flutter_tools/lib/src/reporting/custom_dimensions.dart
@@ -326,12 +326,7 @@ class CustomDimensions {
   }
 
   @override
-  int get hashCode =>
-    toMap()
-      .values
-      .where((String element) => element != null)
-      .fold(Object().hashCode,
-            (int value, String element) => value ^ element.hashCode);
+  int get hashCode => Object.hashAll(toMap().values);
 }
 
 /// List of all fields used in CustomDimensions.
diff --git a/packages/flutter_tools/lib/src/reporting/usage.dart b/packages/flutter_tools/lib/src/reporting/usage.dart
@@ -486,7 +486,7 @@ class TestUsageCommand {
   }
 
   @override
-  int get hashCode => command.hashCode ^ parameters.hashCode;
+  int get hashCode => Object.hash(command, parameters);
 
   @override
   String toString() => 'TestUsageCommand($command, parameters:$parameters)';
@@ -514,11 +514,7 @@ class TestUsageEvent {
   }
 
   @override
-  int get hashCode => category.hashCode ^
-    parameter.hashCode ^
-    label.hashCode ^
-    value.hashCode ^
-    parameters.hashCode;
+  int get hashCode => Object.hash(category, parameter, label, value, parameters);
 
   @override
   String toString() => 'TestUsageEvent($category, $parameter, label:$label, value:$value, parameters:$parameters)';
@@ -544,10 +540,7 @@ class TestTimingEvent {
   }
 
   @override
-  int get hashCode => category.hashCode ^
-    variableName.hashCode ^
-    duration.hashCode ^
-    label.hashCode;
+  int get hashCode => Object.hash(category, variableName, duration, label);
 
   @override
   String toString() => 'TestTimingEvent($category, $variableName, $duration, label:$label)';
diff --git a/packages/flutter_tools/lib/src/vscode/vscode.dart b/packages/flutter_tools/lib/src/vscode/vscode.dart
@@ -326,5 +326,5 @@ class VsCodeInstallLocation {
 
   @override
   // Lowest bit is for isInsiders boolean.
-  int get hashCode => installPath.hashCode ^ extensionsFolder.hashCode ^ edition.hashCode;
+  int get hashCode => Object.hash(installPath, extensionsFolder, edition);
 }
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/clean_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/clean_test.dart
@@ -219,7 +219,7 @@ class CleanWorkspaceCall {
     verbose == other.verbose;
 
   @override
-  int get hashCode => workspacePath.hashCode;
+  int get hashCode => Object.hash(workspacePath, scheme, verbose);
 
   @override
   String toString() => '{$workspacePath, $scheme, $verbose}';

Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,7 @@ class Hash256 {`
`610`	`610`	`}`
`611`	`611`
`612`	`612`	`@override`
`613`		`- int get hashCode => a ^ b ^ c ^ d;`
	`613`	`+ int get hashCode => Object.hash(a, b, c, d);`
`614`	`614`	`}`
`615`	`615`
`616`	`616`	`// DO NOT ADD ANY ENTRIES TO THIS LIST.`
Original file line number	Diff line number	Diff line change
`@@ -128,9 +128,7 @@ class LocaleInfo implements Comparable<LocaleInfo> {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`@override`
`131`		`- int get hashCode {`
`132`		`- return originalString.hashCode;`
`133`		`- }`
	`131`	`+ int get hashCode => originalString.hashCode;`
`134`	`132`
`135`	`133`	`@override`
`136`	`134`	`String toString() {`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ class FrameData {`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`@override`
`277`		`- int get hashCode => size.hashCode ^ paths.hashCode;`
	`277`	`+ int get hashCode => Object.hash(size, Object.hashAll(paths));`
`278`	`278`
`279`	`279`	`@override`
`280`	`280`	`String toString() {`
`@@ -328,7 +328,7 @@ class SvgPath {`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`@override`
`331`		`- int get hashCode => id.hashCode ^ commands.hashCode ^ opacity.hashCode;`
	`331`	`+ int get hashCode => Object.hash(id, Object.hashAll(commands), opacity);`
`332`	`332`
`333`	`333`	`@override`
`334`	`334`	`String toString() {`
`@@ -377,7 +377,7 @@ class SvgPathCommand {`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`@override`
`380`		`- int get hashCode => type.hashCode ^ points.hashCode;`
	`380`	`+ int get hashCode => Object.hash(type, Object.hashAll(points));`
`381`	`381`
`382`	`382`	`@override`
`383`	`383`	`String toString() {`
Original file line number	Diff line number	Diff line change
`@@ -798,7 +798,7 @@ class _DetailArguments {`
`798`	`798`	`}`
`799`	`799`
`800`	`800`	`@override`
`801`		`- int get hashCode => packageName.hashCode; // Good enough.`
	`801`	`+ int get hashCode => hashValues(packageName, hashList(licenseEntries));`
`802`	`802`	`}`
`803`	`803`
`804`	`804`	`class _PackageLicensePage extends StatefulWidget {`
Original file line number	Diff line number	Diff line change
`@@ -814,5 +814,5 @@ class DriverOffset {`
`814`	`814`	`}`
`815`	`815`
`816`	`816`	`@override`
`817`		`- int get hashCode => dx.hashCode ^ dy.hashCode;`
	`817`	`+ int get hashCode => Object.hash(dx, dy);`
`818`	`818`	`}`
Original file line number	Diff line number	Diff line change
`@@ -911,11 +911,7 @@ class _Asset {`
`911`	`911`	`}`
`912`	`912`
`913`	`913`	`@override`
`914`		`- int get hashCode {`
`915`		`- return baseDir.hashCode`
`916`		`- ^ relativeUri.hashCode`
`917`		`- ^ entryUri.hashCode;`
`918`		`- }`
	`914`	`+ int get hashCode => Object.hash(baseDir, relativeUri, entryUri.hashCode);`
`919`	`915`	`}`
`920`	`916`
`921`	`917`	`// Given an assets directory like this:`