diff options
author | Duncan Coutts <duncan@well-typed.com> | 2014-08-22 15:57:07 +0100 |
---|---|---|
committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-08-29 12:39:04 +0100 |
commit | 6930a88c307825d95f22ed9cb8ba3c894b600905 (patch) | |
tree | ee71b933fdce909c7645d28e17917aa61fdae7a6 /utils | |
parent | 227205e1b5143631b1f47ef9b4677a1b6675b067 (diff) | |
download | haskell-6930a88c307825d95f22ed9cb8ba3c894b600905.tar.gz |
Fix warnings arising from the package db refactoring
Diffstat (limited to 'utils')
-rw-r--r-- | utils/ghc-pkg/Main.hs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index d9af8fbd6c..858797f567 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -1,5 +1,6 @@ {-# LANGUAGE CPP, TypeSynonymInstances, FlexibleInstances, RecordWildCards, GeneralizedNewtypeDeriving, StandaloneDeriving #-} +{-# OPTIONS_GHC -fno-warn-orphans #-} ----------------------------------------------------------------------------- -- -- (c) The University of Glasgow 2004-2009. @@ -13,7 +14,6 @@ module Main (main) where import Version ( version, targetOS, targetARCH ) import qualified GHC.PackageDb as GhcPkg import qualified Distribution.Simple.PackageIndex as PackageIndex -import qualified Distribution.Package as Cabal import qualified Distribution.ModuleName as ModuleName import Distribution.ModuleName (ModuleName) import Distribution.InstalledPackageInfo as Cabal @@ -1899,10 +1899,6 @@ throwIOIO = Exception.throwIO catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a catchIO = Exception.catch -catchError :: IO a -> (String -> IO a) -> IO a -catchError io handler = io `Exception.catch` handler' - where handler' (Exception.ErrorCall err) = handler err - tryIO :: IO a -> IO (Either Exception.IOException a) tryIO = Exception.try |