Revert some stylistic changes

haskell · Nov 18, 2023 · 303c0f5 · 303c0f5
1 parent 6954d50
commit 303c0f5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/Codec/Archive/Tar/Entry.hs b/Codec/Archive/Tar/Entry.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Codec.Archive.Tar.Entry

diff --git a/Codec/Archive/Tar/Pack.hs b/Codec/Archive/Tar/Pack.hs
@@ -1,6 +1,3 @@
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE TupleSections #-}
-{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiWayIf #-}
 -----------------------------------------------------------------------------
 -- |
@@ -130,12 +127,11 @@ packFileEntry filepath tarpath = do
   file    <- openBinaryFile filepath ReadMode
   size    <- hFileSize file
   content <- BS.hGetContents file
-  let entry tp = (simpleEntry tp (NormalFile content (fromIntegral size))) {
+  return (simpleEntry tarpath (NormalFile content (fromIntegral size))) {
          entryPermissions = if executable perms then executableFilePermissions
                                                 else ordinaryFilePermissions,
          entryTime = mtime
          }
-  return (entry tarpath)
 
 -- | Construct a tar 'Entry' based on a local directory (but not its contents).
 --
@@ -147,10 +143,9 @@ packDirectoryEntry :: FilePath -- ^ Full path to find the file on the local disk
                    -> IO Entry
 packDirectoryEntry filepath tarpath = do
   mtime   <- getModTime filepath
-  let dEntry tp = (directoryEntry tp) {
+  return (directoryEntry tarpath) {
     entryTime = mtime
   }
-  return (dEntry tarpath)
 
 -- | Construct a tar 'Entry' based on a local symlink.
 --

diff --git a/Codec/Archive/Tar/Unpack.hs b/Codec/Archive/Tar/Unpack.hs
@@ -1,6 +1,5 @@
-{-# LANGUAGE CPP #-}
-{-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE ViewPatterns #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Codec.Archive.Tar