diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-05-27 20:23:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-27 20:26:10 -0400 |
| commit | 9705e51f027bd6b8d706d07af6df6c870c25721c (patch) | |
| tree | 8262091a0fa7a3f9021639a01245a6a63e341e05 | |
| parent | e9745a85b72d43d57b6cba64c7062c49dc65c675 (diff) | |
get rid of (completely safe) uses of Char8
Char8 often indicates an encoding bug. It didn't here, but I can avoid it
and not worry about it.
| -rw-r--r-- | Assistant/Types/NetMessager.hs | 4 | ||||
| -rw-r--r-- | Utility/Hash.hs | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Assistant/Types/NetMessager.hs b/Assistant/Types/NetMessager.hs index 41ab4b272..5ae987a61 100644 --- a/Assistant/Types/NetMessager.hs +++ b/Assistant/Types/NetMessager.hs @@ -12,13 +12,13 @@ import Assistant.Pairing import Git.Types import qualified Data.Text as T +import qualified Data.Text.Encoding as T import qualified Data.Set as S import qualified Data.Map as M import qualified Data.DList as D import Control.Concurrent.STM import Control.Concurrent.MSampleVar import Data.ByteString (ByteString) -import qualified Data.ByteString.Char8 as B8 import Data.Text (Text) {- Messages that can be sent out of band by a network messager. -} @@ -85,7 +85,7 @@ logNetMessage (Pushing c stage) = show $ Pushing (logClientID c) $ SendPackOutput n _ -> SendPackOutput n elided s -> s where - elided = B8.pack "<elided>" + elided = T.encodeUtf8 $ T.pack "<elided>" logNetMessage (PairingNotification stage c uuid) = show $ PairingNotification stage (logClientID c) uuid logNetMessage m = show m diff --git a/Utility/Hash.hs b/Utility/Hash.hs index cecc6af3e..245f45dfa 100644 --- a/Utility/Hash.hs +++ b/Utility/Hash.hs @@ -18,7 +18,8 @@ module Utility.Hash ( ) where import qualified Data.ByteString.Lazy as L -import qualified Data.ByteString.Char8 as C8 +import qualified Data.Text as T +import qualified Data.Text.Encoding as T #ifndef WITH_CRYPTOHASH import Data.Digest.Pure.SHA @@ -66,4 +67,4 @@ prop_hashes_stable = all (\(hasher, result) -> hasher foo == result) #endif ] where - foo = L.fromChunks [C8.pack "foo"] + foo = L.fromStrict $ T.encodeUtf8 $ T.pack "foo" |