git.iko.soy/typeable/file-embed
on master help sign in
Merge remote-tracking branch 'origin/master'

Conflicts: Data/FileEmbed.hs

commit12b13fd80154b92109a74dd97b726159cab59634 authorMichael Snoyman <michael@snoyman.com> dateMon 10 Sep 2012, 16:35 (14 years ago) parenta0f623e820be1b
2 files changed+4−4
Data/FileEmbed.hs+3−3 file-embed.cabal+1−1
Data/FileEmbed.hs+3−3
@@ -66,9 +66,9 @@ getDir :: FilePath -> IO [(FilePath, B.ByteString)]
6666getDir = fileList
6767
6868pairToExp :: FilePath -> (FilePath, B.ByteString) -> Q Exp
69−pairToExp root (path, bs) = do
69+pairToExp _root (path, bs) = do
7070#if MIN_VERSION_template_haskell(2,7,0)
71− qAddDependentFile $ root ++ '/' : path
71+ qAddDependentFile $ _root ++ '/' : path
7272#endif
7373 exp' <- bsToExp bs
7474 return $! TupE [LitE $ StringL path, exp']
@@ -153,7 +153,7 @@ inject toInj orig =
153153 size = case reads $ B8.unpack sizeBS of
154154 (i, _):_ -> i
155155 [] -> error $ "Data.FileEmbed (inject): Your dummy space has been corrupted. Size is: " ++ show sizeBS
156− (_dummy, after) = B.splitAt size rest'
156+ after = B.drop size rest'
157157
158158injectFile :: B.ByteString
159159 -> FilePath -- ^ template file
file-embed.cabal+1−1
@@ -1,5 +1,5 @@
11name: file-embed
2−version: 0.0.4.4
2+version: 0.0.4.5
33license: BSD3
44license-file: LICENSE
55author: Michael Snoyman <michael@snoyman.com>