network-ip 0.3.0.2 → 0.3.0.3
raw patch · 3 files changed
+13/−6 lines, 3 filesPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
API changes (from Hackage documentation)
- Network.IP.Addr: instance (Data.Data.Data t₆, Data.Data.Data t₄) => Data.Data.Data (Network.IP.Addr.IP46 t₄ t₆)
- Network.IP.Addr: instance (GHC.Classes.Eq t₆, GHC.Classes.Eq t₄) => GHC.Classes.Eq (Network.IP.Addr.IP46 t₄ t₆)
- Network.IP.Addr: instance (GHC.Classes.Ord t₆, GHC.Classes.Ord t₄) => GHC.Classes.Ord (Network.IP.Addr.IP46 t₄ t₆)
- Network.IP.Addr: instance (GHC.Read.Read t₆, GHC.Read.Read t₄) => GHC.Read.Read (Network.IP.Addr.IP46 t₄ t₆)
- Network.IP.Addr: instance (GHC.Show.Show t₆, GHC.Show.Show t₄) => GHC.Show.Show (Network.IP.Addr.IP46 t₄ t₆)
+ Network.IP.Addr: -- | The address type.
+ Network.IP.Addr: instance (Data.Data.Data t₄, Data.Data.Data t₆) => Data.Data.Data (Network.IP.Addr.IP46 t₄ t₆)
+ Network.IP.Addr: instance (GHC.Classes.Eq t₄, GHC.Classes.Eq t₆) => GHC.Classes.Eq (Network.IP.Addr.IP46 t₄ t₆)
+ Network.IP.Addr: instance (GHC.Classes.Ord t₄, GHC.Classes.Ord t₆) => GHC.Classes.Ord (Network.IP.Addr.IP46 t₄ t₆)
+ Network.IP.Addr: instance (GHC.Read.Read t₄, GHC.Read.Read t₆) => GHC.Read.Read (Network.IP.Addr.IP46 t₄ t₆)
+ Network.IP.Addr: instance (GHC.Show.Show t₄, GHC.Show.Show t₆) => GHC.Show.Show (Network.IP.Addr.IP46 t₄ t₆)
- Network.IP.Addr: class IsNetAddr n where type NetHost n where {
+ Network.IP.Addr: class IsNetAddr n where {
Files
- network-ip.cabal +3/−2
- src/Network/IP/Addr.hs +7/−4
- tests/Tests.hs +3/−0
network-ip.cabal view
@@ -1,5 +1,5 @@ Name: network-ip-Version: 0.3.0.2+Version: 0.3.0.3 Category: Network Stability: experimental Synopsis: Internet Protocol data structures@@ -18,7 +18,8 @@ Extra-Source-Files: README.md -Tested-With: GHC==7.10.3, GHC==8.0.2, GHC==8.2.1+Tested-With: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.5,+ GHC==8.8.1 Cabal-Version: >= 1.10.0 Build-Type: Simple
src/Network/IP/Addr.hs view
@@ -98,7 +98,10 @@ import qualified Data.Serializer as S import Data.Deserializer (Deserializer, Deserializable) import qualified Data.Deserializer as D-import Text.Printer (Printer, (<>))+import Text.Printer (Printer)+#if !MIN_VERSION_base(4,13,0)+import Text.Printer ((<>))+#endif import qualified Text.Printer as P import qualified Text.Printer.Integral as P import Data.Textual@@ -156,7 +159,7 @@ where octet = (<?> "IPv4 octet") $ do o ← nnUpTo Decimal 3 if o > 255- then fail "out of bounds"+ then D.unexpected "out of bounds" else return $ fromIntegral (o ∷ Int) instance Storable IP4 where@@ -767,7 +770,7 @@ ip4Mask ∷ (CharParsing μ, Monad μ) ⇒ μ Word8 ip4Mask = (<?> "network prefix length") $ do m ← nncUpTo Decimal 2- when (m > 32) $ fail "out of bounds"+ when (m > 32) $ D.unexpected "out of bounds" return m -- | IPv4 network address parser (CIDR notation).@@ -779,7 +782,7 @@ ip6Mask ∷ (CharParsing μ, Monad μ) ⇒ μ Word8 ip6Mask = (<?> "network prefix length") $ do m ← nncUpTo Decimal 3- when (m > (128 ∷ Int)) $ fail "out of bounds"+ when (m > (128 ∷ Int)) $ D.unexpected "out of bounds" return $ fromIntegral m -- | IPv6 network address parser (CIDR notation).
tests/Tests.hs view
@@ -1,3 +1,4 @@+{-# LANGUAGE CPP #-} {-# LANGUAGE UnicodeSyntax #-} {-# LANGUAGE MultiWayIf #-} {-# LANGUAGE TypeSynonymInstances #-}@@ -11,7 +12,9 @@ import Data.DoubleWord import Data.Textual import Network.IP.Addr+#if !MIN_VERSION_base(4,8,0) import Control.Applicative+#endif instance Arbitrary IP4 where arbitrary = IP4 <$> arbitrary