Polish after hashable

nikita-volkov · nikita-volkov · commit 11ee4dbc83ac · 2026-01-22T20:16:43.000+03:00
diff --git a/src/library/PostgresqlTypes/Bit.hs b/src/library/PostgresqlTypes/Bit.hs
@@ -16,7 +16,6 @@ where
 import qualified Data.Attoparsec.Text as Attoparsec
 import qualified Data.Bits as Bits
 import qualified Data.ByteString as ByteString
-import Data.Hashable (Hashable (..))
 import qualified Data.Text as Text
 import qualified Data.Vector.Generic as Vg
 import qualified GHC.TypeLits as TypeLits
@@ -40,6 +39,7 @@ newtype Bit (numBits :: TypeLits.Nat)
       ByteString
   deriving stock (Eq, Ord)
   deriving (Show, Read, IsString) via (ViaIsScalar (Bit numBits))
+  deriving newtype (Hashable)
 
 instance (TypeLits.KnownNat numBits) => Arbitrary (Bit numBits) where
   arbitrary = do
@@ -49,9 +49,6 @@ instance (TypeLits.KnownNat numBits) => Arbitrary (Bit numBits) where
       Nothing -> error "Arbitrary Bit: Generated bit string has incorrect length"
       Just bit -> pure bit
 
-instance Hashable (Bit numBits) where
-  hashWithSalt salt (Bit bytes) = hashWithSalt salt bytes
-
 instance (TypeLits.KnownNat numBits) => IsScalar (Bit numBits) where
   schemaName = Tagged Nothing
   typeName = Tagged "bit"
diff --git a/src/library/PostgresqlTypes/Bool.hs b/src/library/PostgresqlTypes/Bool.hs
@@ -11,7 +11,6 @@ where
 
 import qualified Data.Attoparsec.Text as Attoparsec
 import qualified Data.Bool
-import Data.Hashable (Hashable)
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude hiding (Bool)
 import PostgresqlTypes.Via
diff --git a/src/library/PostgresqlTypes/Box.hs b/src/library/PostgresqlTypes/Box.hs
@@ -14,7 +14,6 @@ module PostgresqlTypes.Box
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable (..))
 import GHC.Float (castDoubleToWord64, castWord64ToDouble)
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
@@ -58,7 +57,8 @@ instance Arbitrary Box where
 
 instance Hashable Box where
   hashWithSalt salt (Box x1 y1 x2 y2) =
-    salt `hashWithSalt` castDoubleToWord64 x1
+    salt
+      `hashWithSalt` castDoubleToWord64 x1
       `hashWithSalt` castDoubleToWord64 y1
       `hashWithSalt` castDoubleToWord64 x2
       `hashWithSalt` castDoubleToWord64 y2
diff --git a/src/library/PostgresqlTypes/Bpchar.hs b/src/library/PostgresqlTypes/Bpchar.hs
@@ -14,7 +14,6 @@ module PostgresqlTypes.Bpchar
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable (..))
 import Data.String
 import qualified Data.Text as Text
 import qualified Data.Text.Encoding as Text.Encoding
@@ -43,9 +42,10 @@ import qualified TextBuilder
 --
 -- For example, @char(1)@ in SQL is @Bpchar 1@ in Haskell, while @\"char\"@ in SQL is
 -- 'PostgresqlTypes.Char.Char' in Haskell. These are completely different types in PostgreSQL.
-data Bpchar (numChars :: TypeLits.Nat) = Bpchar Text
+newtype Bpchar (numChars :: TypeLits.Nat) = Bpchar Text
   deriving stock (Eq, Ord)
   deriving (Show, Read, IsString) via (ViaIsScalar (Bpchar numChars))
+  deriving newtype (Hashable)
 
 instance (TypeLits.KnownNat numChars) => Arbitrary (Bpchar numChars) where
   arbitrary = do
@@ -56,9 +56,6 @@ instance (TypeLits.KnownNat numChars) => Arbitrary (Bpchar numChars) where
       Nothing -> error "Arbitrary Bpchar: Generated string has incorrect length"
       Just char -> pure char
 
-instance Hashable (Bpchar numChars) where
-  hashWithSalt salt (Bpchar txt) = hashWithSalt salt txt
-
 instance (TypeLits.KnownNat numChars) => IsScalar (Bpchar numChars) where
   schemaName = Tagged Nothing
   typeName = Tagged "bpchar"
diff --git a/src/library/PostgresqlTypes/Bytea.hs b/src/library/PostgresqlTypes/Bytea.hs
@@ -11,7 +11,6 @@ where
 
 import qualified Data.Attoparsec.Text as Attoparsec
 import qualified Data.ByteString as ByteString
-import Data.Hashable (Hashable)
 import qualified Data.Text as Text
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
diff --git a/src/library/PostgresqlTypes/Char.hs b/src/library/PostgresqlTypes/Char.hs
@@ -15,7 +15,6 @@ where
 
 import qualified Data.Attoparsec.Text as Attoparsec
 import qualified Data.Char
-import Data.Hashable (Hashable)
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude hiding (Char)
 import PostgresqlTypes.Via
diff --git a/src/library/PostgresqlTypes/Cidr.hs b/src/library/PostgresqlTypes/Cidr.hs
@@ -16,7 +16,6 @@ where
 
 import qualified Data.Attoparsec.Text as Attoparsec
 import Data.Bits
-import Data.Hashable (Hashable (..))
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude hiding (fold)
 import PostgresqlTypes.Via
diff --git a/src/library/PostgresqlTypes/Circle.hs b/src/library/PostgresqlTypes/Circle.hs
@@ -13,7 +13,6 @@ module PostgresqlTypes.Circle
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable (..))
 import GHC.Float (castDoubleToWord64, castWord64ToDouble)
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
@@ -54,7 +53,8 @@ instance Arbitrary Circle where
 
 instance Hashable Circle where
   hashWithSalt salt (Circle x y r) =
-    salt `hashWithSalt` castDoubleToWord64 x
+    salt
+      `hashWithSalt` castDoubleToWord64 x
       `hashWithSalt` castDoubleToWord64 y
       `hashWithSalt` castDoubleToWord64 r
 
diff --git a/src/library/PostgresqlTypes/Date.hs b/src/library/PostgresqlTypes/Date.hs
@@ -11,7 +11,6 @@ module PostgresqlTypes.Date
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable)
 import qualified Data.Time as Time
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
diff --git a/src/library/PostgresqlTypes/Float4.hs b/src/library/PostgresqlTypes/Float4.hs
@@ -10,7 +10,6 @@ module PostgresqlTypes.Float4
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable)
 import GHC.Float (castFloatToWord32, castWord32ToFloat)
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
diff --git a/src/library/PostgresqlTypes/Float8.hs b/src/library/PostgresqlTypes/Float8.hs
@@ -10,7 +10,6 @@ module PostgresqlTypes.Float8
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable)
 import GHC.Float (castDoubleToWord64, castWord64ToDouble)
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
diff --git a/src/library/PostgresqlTypes/Hstore.hs b/src/library/PostgresqlTypes/Hstore.hs
@@ -12,7 +12,6 @@ where
 
 import qualified Data.Attoparsec.Text as Attoparsec
 import qualified Data.ByteString as ByteString
-import Data.Hashable (Hashable (..))
 import qualified Data.Map.Strict as Map
 import qualified Data.Text as Text
 import qualified Data.Text.Encoding as Text.Encoding
@@ -32,7 +31,7 @@ import qualified TextBuilder
 --
 -- [PostgreSQL docs](https://www.postgresql.org/docs/18/hstore.html).
 newtype Hstore = Hstore (Map.Map Text (Maybe Text))
-  deriving newtype (Eq, Ord)
+  deriving newtype (Eq, Ord, Hashable)
   deriving (Show, Read, IsString) via (ViaIsScalar Hstore)
 
 instance Arbitrary Hstore where
@@ -50,9 +49,6 @@ instance Arbitrary Hstore where
   shrink (Hstore base) =
     Hstore . Map.fromList <$> shrink (Map.toList base)
 
-instance Hashable Hstore where
-  hashWithSalt salt (Hstore m) = hashWithSalt salt (Map.toList m)
-
 instance IsScalar Hstore where
   schemaName = Tagged Nothing
   typeName = Tagged "hstore"
diff --git a/src/library/PostgresqlTypes/Inet.hs b/src/library/PostgresqlTypes/Inet.hs
@@ -16,7 +16,6 @@ where
 
 import qualified Data.Attoparsec.Text as Attoparsec
 import Data.Bits
-import Data.Hashable (Hashable (..))
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude hiding (fold)
 import PostgresqlTypes.Via
diff --git a/src/library/PostgresqlTypes/Int2.hs b/src/library/PostgresqlTypes/Int2.hs
@@ -10,7 +10,6 @@ module PostgresqlTypes.Int2
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable)
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
 import PostgresqlTypes.Via
diff --git a/src/library/PostgresqlTypes/Int4.hs b/src/library/PostgresqlTypes/Int4.hs
@@ -10,7 +10,6 @@ module PostgresqlTypes.Int4
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable)
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
 import PostgresqlTypes.Via
diff --git a/src/library/PostgresqlTypes/Int8.hs b/src/library/PostgresqlTypes/Int8.hs
@@ -10,7 +10,6 @@ module PostgresqlTypes.Int8
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable)
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude hiding (Int8)
 import PostgresqlTypes.Via
diff --git a/src/library/PostgresqlTypes/Interval.hs b/src/library/PostgresqlTypes/Interval.hs
@@ -19,7 +19,6 @@ module PostgresqlTypes.Interval
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable (..))
 import qualified Data.Text as Text
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
diff --git a/src/library/PostgresqlTypes/Json.hs b/src/library/PostgresqlTypes/Json.hs
@@ -15,7 +15,6 @@ import qualified Data.Aeson.Key as Aeson.Key
 import qualified Data.Aeson.KeyMap as Aeson.KeyMap
 import qualified Data.Aeson.Text as Aeson.Text
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable (..))
 import qualified Data.Text as Text
 import qualified Data.Text.Encoding as Text.Encoding
 import qualified Jsonifier
@@ -35,16 +34,13 @@ import qualified TextBuilder
 --
 -- [PostgreSQL docs](https://www.postgresql.org/docs/18/datatype-json.html).
 newtype Json = Json Aeson.Value
-  deriving newtype (Eq, Ord)
+  deriving newtype (Eq, Ord, Hashable)
   deriving (Show, Read, IsString) via (ViaIsScalar Json)
 
 instance Arbitrary Json where
   arbitrary = normalizeFromAesonValue <$> arbitrary
   shrink = fmap Json . shrink . toAesonValue
 
-instance Hashable Json where
-  hashWithSalt salt (Json value) = hashWithSalt salt value
-
 instance IsScalar Json where
   schemaName = Tagged Nothing
   typeName = Tagged "json"
diff --git a/src/library/PostgresqlTypes/Jsonb.hs b/src/library/PostgresqlTypes/Jsonb.hs
@@ -15,7 +15,6 @@ import qualified Data.Aeson.Key as Aeson.Key
 import qualified Data.Aeson.KeyMap as Aeson.KeyMap
 import qualified Data.Aeson.Text as Aeson.Text
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable (..))
 import qualified Data.Text as Text
 import qualified Data.Text.Encoding as Text.Encoding
 import qualified Jsonifier
@@ -33,16 +32,13 @@ import qualified TextBuilder
 --
 -- [PostgreSQL docs](https://www.postgresql.org/docs/18/datatype-json.html).
 newtype Jsonb = Jsonb Aeson.Value
-  deriving newtype (Eq, Ord)
+  deriving newtype (Eq, Ord, Hashable)
   deriving (Show, Read, IsString) via (ViaIsScalar Jsonb)
 
 instance Arbitrary Jsonb where
   arbitrary = normalizeFromAesonValue <$> arbitrary
   shrink = fmap Jsonb . shrink . toAesonValue
 
-instance Hashable Jsonb where
-  hashWithSalt salt (Jsonb value) = hashWithSalt salt value
-
 instance IsScalar Jsonb where
   schemaName = Tagged Nothing
   typeName = Tagged "jsonb"
diff --git a/src/library/PostgresqlTypes/Line.hs b/src/library/PostgresqlTypes/Line.hs
@@ -13,7 +13,6 @@ module PostgresqlTypes.Line
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable (..))
 import GHC.Float (castDoubleToWord64, castWord64ToDouble)
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
@@ -57,7 +56,8 @@ instance Arbitrary Line where
 
 instance Hashable Line where
   hashWithSalt salt (Line a b c) =
-    salt `hashWithSalt` castDoubleToWord64 a
+    salt
+      `hashWithSalt` castDoubleToWord64 a
       `hashWithSalt` castDoubleToWord64 b
       `hashWithSalt` castDoubleToWord64 c
 
diff --git a/src/library/PostgresqlTypes/Lseg.hs b/src/library/PostgresqlTypes/Lseg.hs
@@ -13,7 +13,6 @@ module PostgresqlTypes.Lseg
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable (..))
 import GHC.Float (castDoubleToWord64, castWord64ToDouble)
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
@@ -48,7 +47,8 @@ instance Arbitrary Lseg where
 
 instance Hashable Lseg where
   hashWithSalt salt (Lseg x1 y1 x2 y2) =
-    salt `hashWithSalt` castDoubleToWord64 x1
+    salt
+      `hashWithSalt` castDoubleToWord64 x1
       `hashWithSalt` castDoubleToWord64 y1
       `hashWithSalt` castDoubleToWord64 x2
       `hashWithSalt` castDoubleToWord64 y2
diff --git a/src/library/PostgresqlTypes/Macaddr.hs b/src/library/PostgresqlTypes/Macaddr.hs
@@ -15,7 +15,6 @@ module PostgresqlTypes.Macaddr
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable (..))
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
 import PostgresqlTypes.Via
diff --git a/src/library/PostgresqlTypes/Macaddr8.hs b/src/library/PostgresqlTypes/Macaddr8.hs
@@ -17,7 +17,6 @@ module PostgresqlTypes.Macaddr8
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable (..))
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
 import PostgresqlTypes.Via
@@ -69,8 +68,15 @@ instance Arbitrary Macaddr8 where
 
 instance Hashable Macaddr8 where
   hashWithSalt salt (Macaddr8 a b c d e f g h) =
-    salt `hashWithSalt` a `hashWithSalt` b `hashWithSalt` c `hashWithSalt` d
-      `hashWithSalt` e `hashWithSalt` f `hashWithSalt` g `hashWithSalt` h
+    salt
+      `hashWithSalt` a
+      `hashWithSalt` b
+      `hashWithSalt` c
+      `hashWithSalt` d
+      `hashWithSalt` e
+      `hashWithSalt` f
+      `hashWithSalt` g
+      `hashWithSalt` h
 
 instance IsScalar Macaddr8 where
   schemaName = Tagged Nothing
diff --git a/src/library/PostgresqlTypes/Money.hs b/src/library/PostgresqlTypes/Money.hs
@@ -10,7 +10,6 @@ module PostgresqlTypes.Money
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable)
 import qualified Data.Text as Text
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
diff --git a/src/library/PostgresqlTypes/Multirange.hs b/src/library/PostgresqlTypes/Multirange.hs
@@ -13,7 +13,6 @@ where
 
 import qualified BaseExtras.List
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable (..))
 import qualified Data.Set as Set
 import qualified Data.Vector as Vector
 import PostgresqlTypes.Algebra
diff --git a/src/library/PostgresqlTypes/Numeric.hs b/src/library/PostgresqlTypes/Numeric.hs
@@ -21,7 +21,6 @@ module PostgresqlTypes.Numeric
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable (..))
 import qualified Data.Scientific as Scientific
 import qualified Data.Text as Text
 import qualified GHC.TypeLits as TypeLits
diff --git a/src/library/PostgresqlTypes/Oid.hs b/src/library/PostgresqlTypes/Oid.hs
@@ -10,7 +10,6 @@ module PostgresqlTypes.Oid
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable)
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
 import PostgresqlTypes.Via
diff --git a/src/library/PostgresqlTypes/Path.hs b/src/library/PostgresqlTypes/Path.hs
@@ -13,7 +13,6 @@ module PostgresqlTypes.Path
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable (..))
 import qualified Data.Vector.Unboxed as UnboxedVector
 import GHC.Float (castDoubleToWord64, castWord64ToDouble)
 import PostgresqlTypes.Algebra
diff --git a/src/library/PostgresqlTypes/Point.hs b/src/library/PostgresqlTypes/Point.hs
@@ -11,7 +11,6 @@ module PostgresqlTypes.Point
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable (..))
 import GHC.Float (castDoubleToWord64, castWord64ToDouble)
 import PostgresqlTypes.Algebra
 import PostgresqlTypes.Prelude
diff --git a/src/library/PostgresqlTypes/Polygon.hs b/src/library/PostgresqlTypes/Polygon.hs
@@ -12,7 +12,6 @@ module PostgresqlTypes.Polygon
 where
 
 import qualified Data.Attoparsec.Text as Attoparsec
-import Data.Hashable (Hashable (..))
 import qualified Data.Vector.Unboxed as UnboxedVector
 import GHC.Float (castDoubleToWord64, castWord64ToDouble)
 import PostgresqlTypes.Algebra
diff --git a/src/library/PostgresqlTypes/Prelude.hs b/src/library/PostgresqlTypes/Prelude.hs
diff --git a/src/library/PostgresqlTypes/Range.hs b/src/library/PostgresqlTypes/Range.hs
diff --git a/src/library/PostgresqlTypes/Text.hs b/src/library/PostgresqlTypes/Text.hs
diff --git a/src/library/PostgresqlTypes/Time.hs b/src/library/PostgresqlTypes/Time.hs
diff --git a/src/library/PostgresqlTypes/Timestamp.hs b/src/library/PostgresqlTypes/Timestamp.hs
diff --git a/src/library/PostgresqlTypes/Timestamptz.hs b/src/library/PostgresqlTypes/Timestamptz.hs
diff --git a/src/library/PostgresqlTypes/Timetz.hs b/src/library/PostgresqlTypes/Timetz.hs
diff --git a/src/library/PostgresqlTypes/Uuid.hs b/src/library/PostgresqlTypes/Uuid.hs
diff --git a/src/library/PostgresqlTypes/Varbit.hs b/src/library/PostgresqlTypes/Varbit.hs
diff --git a/src/library/PostgresqlTypes/Varchar.hs b/src/library/PostgresqlTypes/Varchar.hs
