tfausak/witch
1
1
Fork 0
mirror of https://github.com/tfausak/witch.git synced 2024-11-26 09:43:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #65 from tfausak/2022-10-03-remove-old-utf8

Browse Source 
Remove instances with untagged UTF-8 conversions
This commit is contained in:
Taylor Fausak 2022-10-03 13:30:12 -05:00 committed by GitHub
commit a72b1a993d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
source/library/Witch/Instances.hs
View File

@ -1039,21 +1039,10 @@ instance From.From ByteString.ByteString LazyByteString.ByteString where
instance From.From ByteString.ByteString ShortByteString.ShortByteString where
from = ShortByteString.toShort
-- | Uses 'Text.decodeUtf8''.
instance TryFrom.TryFrom ByteString.ByteString Text.Text where
tryFrom = Utility.eitherTryFrom Text.decodeUtf8'
-- | Uses 'Text.decodeUtf8''.
instance TryFrom.TryFrom (Tagged.Tagged "UTF-8" ByteString.ByteString) Text.Text where
tryFrom = Utility.eitherTryFrom $ Text.decodeUtf8' . From.from
-- | Converts via 'Text.Text'.
instance TryFrom.TryFrom ByteString.ByteString LazyText.Text where
tryFrom =
Utility.eitherTryFrom $
fmap (Utility.into @LazyText.Text)
. Utility.tryInto @Text.Text
-- | Converts via 'Text.Text'.
instance TryFrom.TryFrom (Tagged.Tagged "UTF-8" ByteString.ByteString) LazyText.Text where
tryFrom =
@ -1061,13 +1050,6 @@ instance TryFrom.TryFrom (Tagged.Tagged "UTF-8" ByteString.ByteString) LazyText.
fmap (Utility.into @LazyText.Text)
. Utility.tryInto @Text.Text
-- | Converts via 'Text.Text'.
instance TryFrom.TryFrom ByteString.ByteString String where
tryFrom =
Utility.eitherTryFrom $
fmap (Utility.into @String)
. Utility.tryInto @Text.Text
-- | Converts via 'Text.Text'.
instance TryFrom.TryFrom (Tagged.Tagged "UTF-8" ByteString.ByteString) String where
tryFrom =
@ -1089,21 +1071,10 @@ instance From.From LazyByteString.ByteString [Word.Word8] where
instance From.From LazyByteString.ByteString ByteString.ByteString where
from = LazyByteString.toStrict
-- | Uses 'LazyText.decodeUtf8''.
instance TryFrom.TryFrom LazyByteString.ByteString LazyText.Text where
tryFrom = Utility.eitherTryFrom LazyText.decodeUtf8'
-- | Uses 'LazyText.decodeUtf8''.
instance TryFrom.TryFrom (Tagged.Tagged "UTF-8" LazyByteString.ByteString) LazyText.Text where
tryFrom = Utility.eitherTryFrom $ LazyText.decodeUtf8' . From.from
-- | Converts via 'LazyText.Text'.
instance TryFrom.TryFrom LazyByteString.ByteString Text.Text where
tryFrom =
Utility.eitherTryFrom $
fmap (Utility.into @Text.Text)
. Utility.tryInto @LazyText.Text
-- | Converts via 'LazyText.Text'.
instance TryFrom.TryFrom (Tagged.Tagged "UTF-8" LazyByteString.ByteString) Text.Text where
tryFrom =
@ -1111,13 +1082,6 @@ instance TryFrom.TryFrom (Tagged.Tagged "UTF-8" LazyByteString.ByteString) Text.
fmap (Utility.into @Text.Text)
. Utility.tryInto @LazyText.Text
-- | Converts via 'LazyText.Text'.
instance TryFrom.TryFrom LazyByteString.ByteString String where
tryFrom =
Utility.eitherTryFrom $
fmap (Utility.into @String)
. Utility.tryInto @LazyText.Text
-- | Converts via 'LazyText.Text'.
instance TryFrom.TryFrom (Tagged.Tagged "UTF-8" LazyByteString.ByteString) String where
tryFrom =
@ -1145,18 +1109,10 @@ instance From.From ShortByteString.ShortByteString ByteString.ByteString where
instance From.From Text.Text LazyText.Text where
from = LazyText.fromStrict
-- | Uses 'Text.encodeUtf8'.
instance From.From Text.Text ByteString.ByteString where
from = Text.encodeUtf8
-- | Uses 'Text.encodeUtf8'.
instance From.From Text.Text (Tagged.Tagged "UTF-8" ByteString.ByteString) where
from = From.from . Text.encodeUtf8
-- | Converts via 'ByteString.ByteString'.
instance From.From Text.Text LazyByteString.ByteString where
from = Utility.via @ByteString.ByteString
-- | Converts via 'ByteString.ByteString'.
instance From.From Text.Text (Tagged.Tagged "UTF-8" LazyByteString.ByteString) where
from = fmap From.from . Utility.into @(Tagged.Tagged "UTF-8" ByteString.ByteString)
@ -1167,18 +1123,10 @@ instance From.From Text.Text (Tagged.Tagged "UTF-8" LazyByteString.ByteString) w
instance From.From LazyText.Text Text.Text where
from = LazyText.toStrict
-- | Uses 'LazyText.encodeUtf8'.
instance From.From LazyText.Text LazyByteString.ByteString where
from = LazyText.encodeUtf8
-- | Uses 'LazyText.encodeUtf8'.
instance From.From LazyText.Text (Tagged.Tagged "UTF-8" LazyByteString.ByteString) where
from = From.from . LazyText.encodeUtf8
-- | Converts via 'LazyByteString.ByteString'.
instance From.From LazyText.Text ByteString.ByteString where
from = Utility.via @LazyByteString.ByteString
-- | Converts via 'LazyByteString.ByteString'.
instance From.From LazyText.Text (Tagged.Tagged "UTF-8" ByteString.ByteString) where
from = fmap From.from . Utility.into @(Tagged.Tagged "UTF-8" LazyByteString.ByteString)
@ -1203,18 +1151,10 @@ instance From.From String LazyText.Text where
instance From.From LazyText.Text String where
from = LazyText.unpack
-- | Converts via 'Text.Text'.
instance From.From String ByteString.ByteString where
from = Utility.via @Text.Text
-- | Converts via 'Text.Text'.
instance From.From String (Tagged.Tagged "UTF-8" ByteString.ByteString) where
from = Utility.via @Text.Text
-- | Converts via 'LazyText.Text'.
instance From.From String LazyByteString.ByteString where
from = Utility.via @LazyText.Text
-- | Converts via 'LazyText.Text'.
instance From.From String (Tagged.Tagged "UTF-8" LazyByteString.ByteString) where
from = Utility.via @LazyText.Text

78
source/test-suite/Main.hs
View File

@ -1800,13 +1800,6 @@ spec = describe "Witch" $ do
f (ByteString.pack [0x00]) `shouldBe` ShortByteString.pack [0x00]
f (ByteString.pack [0x0f, 0xf0]) `shouldBe` ShortByteString.pack [0x0f, 0xf0]
describe "TryFrom ByteString Text" $ do
let f = hush . Witch.tryFrom @ByteString.ByteString @Text.Text
it "works" $ do
f (ByteString.pack []) `shouldBe` Just (Text.pack "")
f (ByteString.pack [0x61]) `shouldBe` Just (Text.pack "a")
f (ByteString.pack [0xff]) `shouldBe` Nothing
describe "TryFrom ByteString Text" $ do
let f = hush . Witch.tryFrom @(Tagged.Tagged "UTF-8" ByteString.ByteString) @Text.Text
it "works" $ do
@ -1814,13 +1807,6 @@ spec = describe "Witch" $ do
f (Tagged.Tagged (ByteString.pack [0x61])) `shouldBe` Just (Text.pack "a")
f (Tagged.Tagged (ByteString.pack [0xff])) `shouldBe` Nothing
describe "TryFrom ByteString LazyText" $ do
let f = hush . Witch.tryFrom @ByteString.ByteString @LazyText.Text
it "works" $ do
f (ByteString.pack []) `shouldBe` Just (LazyText.pack "")
f (ByteString.pack [0x61]) `shouldBe` Just (LazyText.pack "a")
f (ByteString.pack [0xff]) `shouldBe` Nothing
describe "TryFrom ByteString LazyText" $ do
let f = hush . Witch.tryFrom @(Tagged.Tagged "UTF-8" ByteString.ByteString) @LazyText.Text
it "works" $ do
@ -1828,13 +1814,6 @@ spec = describe "Witch" $ do
f (Tagged.Tagged (ByteString.pack [0x61])) `shouldBe` Just (LazyText.pack "a")
f (Tagged.Tagged (ByteString.pack [0xff])) `shouldBe` Nothing
describe "TryFrom ByteString String" $ do
let f = hush . Witch.tryFrom @ByteString.ByteString @String
it "works" $ do
f (ByteString.pack []) `shouldBe` Just ""
f (ByteString.pack [0x61]) `shouldBe` Just "a"
f (ByteString.pack [0xff]) `shouldBe` Nothing
describe "TryFrom ByteString String" $ do
let f = hush . Witch.tryFrom @(Tagged.Tagged "UTF-8" ByteString.ByteString) @String
it "works" $ do
@ -1863,20 +1842,6 @@ spec = describe "Witch" $ do
f (LazyByteString.pack [0x00]) `shouldBe` ByteString.pack [0x00]
f (LazyByteString.pack [0x0f, 0xf0]) `shouldBe` ByteString.pack [0x0f, 0xf0]
describe "TryFrom LazyByteString LazyText" $ do
let f = hush . Witch.tryFrom @LazyByteString.ByteString @LazyText.Text
it "works" $ do
f (LazyByteString.pack []) `shouldBe` Just (LazyText.pack "")
f (LazyByteString.pack [0x61]) `shouldBe` Just (LazyText.pack "a")
f (LazyByteString.pack [0xff]) `shouldBe` Nothing
describe "TryFrom LazyByteString Text" $ do
let f = hush . Witch.tryFrom @LazyByteString.ByteString @Text.Text
it "works" $ do
f (LazyByteString.pack []) `shouldBe` Just (Text.pack "")
f (LazyByteString.pack [0x61]) `shouldBe` Just (Text.pack "a")
f (LazyByteString.pack [0xff]) `shouldBe` Nothing
describe "TryFrom LazyByteString LazyText" $ do
let f = hush . Witch.tryFrom @(Tagged.Tagged "UTF-8" LazyByteString.ByteString) @LazyText.Text
it "works" $ do
@ -1891,13 +1856,6 @@ spec = describe "Witch" $ do
f (Tagged.Tagged (LazyByteString.pack [0x61])) `shouldBe` Just (Text.pack "a")
f (Tagged.Tagged (LazyByteString.pack [0xff])) `shouldBe` Nothing
describe "TryFrom LazyByteString String" $ do
let f = hush . Witch.tryFrom @LazyByteString.ByteString @String
it "works" $ do
f (LazyByteString.pack []) `shouldBe` Just ""
f (LazyByteString.pack [0x61]) `shouldBe` Just "a"
f (LazyByteString.pack [0xff]) `shouldBe` Nothing
describe "TryFrom LazyByteString String" $ do
let f = hush . Witch.tryFrom @(Tagged.Tagged "UTF-8" LazyByteString.ByteString) @String
it "works" $ do
@ -1933,24 +1891,12 @@ spec = describe "Witch" $ do
f (Text.pack "a") `shouldBe` LazyText.pack "a"
f (Text.pack "ab") `shouldBe` LazyText.pack "ab"
describe "From Text ByteString" $ do
let f = Witch.from @Text.Text @ByteString.ByteString
it "works" $ do
f (Text.pack "") `shouldBe` ByteString.pack []
f (Text.pack "a") `shouldBe` ByteString.pack [0x61]
describe "From Text ByteString" $ do
let f = Witch.from @Text.Text @(Tagged.Tagged "UTF-8" ByteString.ByteString)
it "works" $ do
f (Text.pack "") `shouldBe` Tagged.Tagged (ByteString.pack [])
f (Text.pack "a") `shouldBe` Tagged.Tagged (ByteString.pack [0x61])
describe "From Text LazyByteString" $ do
let f = Witch.from @Text.Text @LazyByteString.ByteString
it "works" $ do
f (Text.pack "") `shouldBe` LazyByteString.pack []
f (Text.pack "a") `shouldBe` LazyByteString.pack [0x61]
describe "From Text LazyByteString" $ do
let f = Witch.from @Text.Text @(Tagged.Tagged "UTF-8" LazyByteString.ByteString)
it "works" $ do
@ -1964,24 +1910,12 @@ spec = describe "Witch" $ do
f (LazyText.pack "a") `shouldBe` Text.pack "a"
f (LazyText.pack "ab") `shouldBe` Text.pack "ab"
describe "From LazyText LazyByteString" $ do
let f = Witch.from @LazyText.Text @LazyByteString.ByteString
it "works" $ do
f (LazyText.pack "") `shouldBe` LazyByteString.pack []
f (LazyText.pack "a") `shouldBe` LazyByteString.pack [0x61]
describe "From LazyText LazyByteString" $ do
let f = Witch.from @LazyText.Text @(Tagged.Tagged "UTF-8" LazyByteString.ByteString)
it "works" $ do
f (LazyText.pack "") `shouldBe` Tagged.Tagged (LazyByteString.pack [])
f (LazyText.pack "a") `shouldBe` Tagged.Tagged (LazyByteString.pack [0x61])
describe "From LazyText ByteString" $ do
let f = Witch.from @LazyText.Text @ByteString.ByteString
it "works" $ do
f (LazyText.pack "") `shouldBe` ByteString.pack []
f (LazyText.pack "a") `shouldBe` ByteString.pack [0x61]
describe "From LazyText ByteString" $ do
let f = Witch.from @LazyText.Text @(Tagged.Tagged "UTF-8" ByteString.ByteString)
it "works" $ do
@ -2016,24 +1950,12 @@ spec = describe "Witch" $ do
f (LazyText.pack "a") `shouldBe` "a"
f (LazyText.pack "ab") `shouldBe` "ab"
describe "From String ByteString" $ do
let f = Witch.from @String @ByteString.ByteString
it "works" $ do
f "" `shouldBe` ByteString.pack []
f "a" `shouldBe` ByteString.pack [0x61]
describe "From String ByteString" $ do
let f = Witch.from @String @(Tagged.Tagged "UTF-8" ByteString.ByteString)
it "works" $ do
f "" `shouldBe` Tagged.Tagged (ByteString.pack [])
f "a" `shouldBe` Tagged.Tagged (ByteString.pack [0x61])
describe "From String LazyByteString" $ do
let f = Witch.from @String @LazyByteString.ByteString
it "works" $ do
f "" `shouldBe` LazyByteString.pack []
f "a" `shouldBe` LazyByteString.pack [0x61]
describe "From String LazyByteString" $ do
let f = Witch.from @String @(Tagged.Tagged "UTF-8" LazyByteString.ByteString)
it "works" $ do