From e13dc0a947bc1085393ab6dfd71859d39c03b768 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Mon, 31 Jul 2023 11:39:19 +0200 Subject: [PATCH] fix(dynamite): Skip comparing nullable in type results --- packages/dynamite/dynamite/lib/src/type_result/enum.dart | 8 ++------ packages/dynamite/dynamite/lib/src/type_result/list.dart | 8 ++------ packages/dynamite/dynamite/lib/src/type_result/map.dart | 8 ++------ .../dynamite/lib/src/type_result/type_result.dart | 4 ++-- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/packages/dynamite/dynamite/lib/src/type_result/enum.dart b/packages/dynamite/dynamite/lib/src/type_result/enum.dart index 8f2cc279..9aab53c1 100644 --- a/packages/dynamite/dynamite/lib/src/type_result/enum.dart +++ b/packages/dynamite/dynamite/lib/src/type_result/enum.dart @@ -34,12 +34,8 @@ class TypeResultEnum extends TypeResult { @override bool operator ==(final Object other) => - other is TypeResultEnum && - other.className == className && - other.generics == generics && - other.nullable == nullable && - other.subType == subType; + other is TypeResultEnum && other.className == className && other.generics == generics && other.subType == subType; @override - int get hashCode => className.hashCode + generics.hashCode + nullable.hashCode + subType.hashCode; + int get hashCode => className.hashCode + generics.hashCode + subType.hashCode; } diff --git a/packages/dynamite/dynamite/lib/src/type_result/list.dart b/packages/dynamite/dynamite/lib/src/type_result/list.dart index a3ce03ce..01230c91 100644 --- a/packages/dynamite/dynamite/lib/src/type_result/list.dart +++ b/packages/dynamite/dynamite/lib/src/type_result/list.dart @@ -34,12 +34,8 @@ class TypeResultList extends TypeResult { @override bool operator ==(final Object other) => - other is TypeResultList && - other.className == className && - other.generics == generics && - other.nullable == nullable && - other.subType == subType; + other is TypeResultList && other.className == className && other.generics == generics && other.subType == subType; @override - int get hashCode => className.hashCode + generics.hashCode + nullable.hashCode + subType.hashCode; + int get hashCode => className.hashCode + generics.hashCode + subType.hashCode; } diff --git a/packages/dynamite/dynamite/lib/src/type_result/map.dart b/packages/dynamite/dynamite/lib/src/type_result/map.dart index 7ae50130..683ff9b1 100644 --- a/packages/dynamite/dynamite/lib/src/type_result/map.dart +++ b/packages/dynamite/dynamite/lib/src/type_result/map.dart @@ -21,12 +21,8 @@ class TypeResultMap extends TypeResult { @override bool operator ==(final Object other) => - other is TypeResultMap && - other.className == className && - other.generics == generics && - other.nullable == nullable && - other.subType == subType; + other is TypeResultMap && other.className == className && other.generics == generics && other.subType == subType; @override - int get hashCode => className.hashCode + generics.hashCode + nullable.hashCode + subType.hashCode; + int get hashCode => className.hashCode + generics.hashCode + subType.hashCode; } diff --git a/packages/dynamite/dynamite/lib/src/type_result/type_result.dart b/packages/dynamite/dynamite/lib/src/type_result/type_result.dart index 021b0d93..89119592 100644 --- a/packages/dynamite/dynamite/lib/src/type_result/type_result.dart +++ b/packages/dynamite/dynamite/lib/src/type_result/type_result.dart @@ -101,8 +101,8 @@ abstract class TypeResult { @override bool operator ==(final Object other) => - other is TypeResult && other.className == className && other.generics == generics && other.nullable == nullable; + other is TypeResult && other.className == className && other.generics == generics; @override - int get hashCode => className.hashCode + generics.hashCode + nullable.hashCode; + int get hashCode => className.hashCode + generics.hashCode; }