From 75b6ee81f9d9b921106c829380e30445415ec2f7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 20 Jun 2012 13:13:40 -0400 Subject: avoid ByteString.Char8 where not needed Its truncation behavior is a red flag, so avoid using it in these places where only raw ByteStrings are used, without looking at the data inside. --- Annex/CatFile.hs | 2 +- Crypto.hs | 2 +- Git/CatFile.hs | 4 ++-- Remote/Bup.hs | 2 +- Remote/Directory.hs | 4 ++-- Remote/Hook.hs | 2 +- Remote/Rsync.hs | 2 +- Utility/Gpg.hs | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Annex/CatFile.hs b/Annex/CatFile.hs index afb14c67f..88c498d31 100644 --- a/Annex/CatFile.hs +++ b/Annex/CatFile.hs @@ -12,7 +12,7 @@ module Annex.CatFile ( catFileHandle ) where -import qualified Data.ByteString.Lazy.Char8 as L +import qualified Data.ByteString.Lazy as L import Common.Annex import qualified Git diff --git a/Crypto.hs b/Crypto.hs index 8941f7637..01322c403 100644 --- a/Crypto.hs +++ b/Crypto.hs @@ -26,7 +26,7 @@ module Crypto ( prop_hmacWithCipher_sane ) where -import qualified Data.ByteString.Lazy.Char8 as L +import qualified Data.ByteString.Lazy as L import Data.ByteString.Lazy.UTF8 (fromString) import Data.Digest.Pure.SHA import Control.Applicative diff --git a/Git/CatFile.hs b/Git/CatFile.hs index 8a320a712..e667b2087 100644 --- a/Git/CatFile.hs +++ b/Git/CatFile.hs @@ -15,8 +15,8 @@ module Git.CatFile ( ) where import System.IO -import qualified Data.ByteString.Char8 as S -import qualified Data.ByteString.Lazy.Char8 as L +import qualified Data.ByteString as S +import qualified Data.ByteString.Lazy as L import Common import Git diff --git a/Remote/Bup.hs b/Remote/Bup.hs index 3e7e9211f..f1a36e468 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -7,7 +7,7 @@ module Remote.Bup (remote) where -import qualified Data.ByteString.Lazy.Char8 as L +import qualified Data.ByteString.Lazy as L import qualified Data.Map as M import System.Process diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 7521e7013..a5b0ff2a2 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -7,8 +7,8 @@ module Remote.Directory (remote) where -import qualified Data.ByteString.Lazy.Char8 as L -import qualified Data.ByteString.Char8 as S +import qualified Data.ByteString.Lazy as L +import qualified Data.ByteString as S import qualified Data.Map as M import qualified Control.Exception as E diff --git a/Remote/Hook.hs b/Remote/Hook.hs index 1202c6087..5fb793e65 100644 --- a/Remote/Hook.hs +++ b/Remote/Hook.hs @@ -7,7 +7,7 @@ module Remote.Hook (remote) where -import qualified Data.ByteString.Lazy.Char8 as L +import qualified Data.ByteString.Lazy as L import qualified Data.Map as M import System.Exit import System.Environment diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index 3c449b5de..6207e1425 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -7,7 +7,7 @@ module Remote.Rsync (remote) where -import qualified Data.ByteString.Lazy.Char8 as L +import qualified Data.ByteString.Lazy as L import qualified Data.Map as M import Common.Annex diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs index ff6735ba5..e13afe5d4 100644 --- a/Utility/Gpg.hs +++ b/Utility/Gpg.hs @@ -7,7 +7,7 @@ module Utility.Gpg where -import qualified Data.ByteString.Lazy.Char8 as L +import qualified Data.ByteString.Lazy as L import System.Posix.Types import Control.Applicative import Control.Concurrent -- cgit v1.2.3