ip 1.7.1 → 1.7.2

raw patch · 5 files changed

+11/−12 lines, 5 filesdep +bytebuilddep −small-bytearray-builder

Dependencies added: bytebuild

Dependencies removed: small-bytearray-builder

Files

• ip.cabal +3/−3
• src/Net/IP.hs +1/−1
• src/Net/IPv4.hs +3/−3
• src/Net/IPv6.hs +1/−1
• src/Net/Mac.hs +3/−4

@@ -1,6 +1,6 @@ cabal-version: 2.2 name: ip-version: 1.7.1+version: 1.7.2 synopsis: Library for IP and MAC addresses homepage: https://github.com/andrewthad/haskell-ip#readme license: BSD-3-Clause@@ -46,7 +46,7 @@     Data.Text.Builder.Variable     Data.Word.Synthetic.Word12   build-depends:-    , aeson >= 1.0 && < 1.5+    , aeson >= 1.0 && < 1.6     , attoparsec >= 0.13 && < 0.14     , base >= 4.9 && < 5     , byteslice >= 0.1.2 && < 0.3@@ -56,7 +56,7 @@     , hashable >= 1.2 && < 1.4     , natural-arithmetic >= 0.1 && <0.2     , primitive >= 0.6.4 && < 0.8-    , small-bytearray-builder >= 0.3.2 && <0.4+    , bytebuild >= 0.3.4 && <0.4     , text >= 1.2 && < 1.3     , text-short >= 0.1.3 && < 0.2     , vector >= 0.11 && < 0.13

@@ -72,7 +72,7 @@  import qualified Arithmetic.Lte as Lte import qualified Data.Aeson as Aeson-import qualified Data.ByteArray.Builder.Bounded as BB+import qualified Data.Bytes.Builder.Bounded as BB import qualified Data.Text.IO as TIO import qualified Data.Bytes.Parser as Parser import qualified Net.IPv4 as IPv4

@@ -127,8 +127,8 @@ import qualified Data.Attoparsec.ByteString.Char8 as AB import qualified Data.Attoparsec.Text as AT import qualified Data.Bits as Bits-import qualified Data.ByteArray.Builder.Bounded as BB-import qualified Data.ByteArray.Builder as UB+import qualified Data.Bytes.Builder.Bounded as BB+import qualified Data.Bytes.Builder as UB import qualified Data.ByteString.Builder as Builder import qualified Data.ByteString.Char8 as BC8 import qualified Data.ByteString.Internal as I@@ -519,7 +519,7 @@ -- | Encode an 'IPv4' address as a unbounded byte array builder. -- -- >>> Chunks.concat (UB.run 1 (byteArrayBuilderUtf8 (fromOctets 192 168 2 13)))--- [0x31, 0x39, 0x32, 0x2e, 0x31, 0x36, 0x38, 0x2e, 0x32, 0x2e, 0x31, 0x33]+-- [0x31,0x39,0x32,0x2e,0x31,0x36,0x38,0x2e,0x32,0x2e,0x31,0x33] -- -- Note that period is encoded by UTF-8 as @0x2e@. byteArrayBuilderUtf8 :: IPv4 -> UB.Builder

@@ -96,7 +96,7 @@ import qualified Data.Aeson as Aeson import qualified Data.Attoparsec.Text as AT import qualified Data.Attoparsec.Text as Atto-import qualified Data.ByteArray.Builder.Bounded as BB+import qualified Data.Bytes.Builder.Bounded as BB import qualified Data.Bytes as Bytes import qualified Data.Bytes.Parser as Parser import qualified Data.Bytes.Parser.Latin as Latin

@@ -77,13 +77,12 @@ import Text.ParserCombinators.ReadPrec (prec,step) import Text.Read (Read(..),Lexeme(Ident),lexP,parens) -import qualified Arithmetic.Nat as Nat import qualified Data.Aeson as Aeson import qualified Data.Aeson.Types as Aeson import qualified Data.Attoparsec.ByteString as AB import qualified Data.Attoparsec.ByteString as ABW import qualified Data.Attoparsec.Text as AT-import qualified Data.ByteArray.Builder.Bounded as BBB+import qualified Data.Bytes.Builder.Bounded as BBB import qualified Data.Bytes as Bytes import qualified Data.Bytes.Parser as Parser import qualified Data.Bytes.Parser.Latin as Latin@@ -752,7 +751,7 @@ macToWord16A# :: Mac -> Word# macToWord16A# (Mac w) = case word64ToWord16 (unsafeShiftR w 32) of   W16# x -> x-  + macToWord16B# :: Mac -> Word# macToWord16B# (Mac w) = case word64ToWord16 (unsafeShiftR w 16) of   W16# x -> x@@ -760,7 +759,7 @@ macToWord16C# :: Mac -> Word# macToWord16C# (Mac w) = case word64ToWord16 w of   W16# x -> x-  + macFromWord16# :: Word# -> Word# -> Word# -> Mac macFromWord16# a b c = Mac     $ (unsafeShiftL (word16ToWord64 (W16# a)) 32)