From 6930a88c307825d95f22ed9cb8ba3c894b600905 Mon Sep 17 00:00:00 2001 From: Duncan Coutts Date: Fri, 22 Aug 2014 15:57:07 +0100 Subject: Fix warnings arising from the package db refactoring --- utils/ghc-pkg/Main.hs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'utils') 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 -- cgit v1.2.1