From fb19d021ca76fc5ada37cba94c051be3379372ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Tue, 14 Apr 2015 21:39:11 +0200 Subject: [PATCH] Fix a few warnings --- Language/Haskell/GhcMod/Utils.hs | 7 ++++--- ghc-mod.cabal | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Language/Haskell/GhcMod/Utils.hs b/Language/Haskell/GhcMod/Utils.hs index 0ff4c22..91331b5 100644 --- a/Language/Haskell/GhcMod/Utils.hs +++ b/Language/Haskell/GhcMod/Utils.hs @@ -27,14 +27,14 @@ import Data.Char import Language.Haskell.GhcMod.Error import Language.Haskell.GhcMod.Monad.Types import Exception -import System.Directory (getCurrentDirectory, setCurrentDirectory, doesFileExist) +import System.Directory (getCurrentDirectory, setCurrentDirectory, doesFileExist, + getTemporaryDirectory, canonicalizePath, doesFileExist) import System.Process (readProcess) -import System.Directory (getTemporaryDirectory) +import System.Directory () import System.FilePath (splitDrive, takeDirectory, takeFileName, pathSeparators, ()) import System.IO.Temp (createTempDirectory) import System.Environment -import System.Directory import Text.Printf import Paths_ghc_mod (getLibexecDir) @@ -161,6 +161,7 @@ getExecutablePath' = getExecutablePath getExecutablePath' = getProgName #endif +canonFilePath :: FilePath -> IO FilePath canonFilePath f = do p <- canonicalizePath f e <- doesFileExist p diff --git a/ghc-mod.cabal b/ghc-mod.cabal index 2c15b66..3743948 100644 --- a/ghc-mod.cabal +++ b/ghc-mod.cabal @@ -28,7 +28,7 @@ Cabal-Version: >= 1.14 Build-Type: Custom Data-Files: elisp/Makefile elisp/*.el - +Data-Files: LICENSE COPYING.BSD3 COPYING.AGPL3 Extra-Source-Files: ChangeLog SetupCompat.hs NotCPP/*.hs