From 7f324e08476792e522987867c0f8098eeb0e50e0 Mon Sep 17 00:00:00 2001 From: Adam Vogt Date: Fri, 9 Nov 2012 02:35:06 +0100 Subject: Use Control.Exception.catch explitly to avoid warnings Ignore-this: 2cebdfe604c581f2b4a644e9aed726c7 The base that comes with ghc-7.6.1 no longer includes Prelude.catch; so these modules were changed so that there is no warning for import Prelude hiding (catch) At the same time these changes should be compatible with older GHCs, since the catch being has never been the one in the Prelude. darcs-hash:20121109013506-1499c-c593662b0780eb49287efcbfe0e9796f7dd57c73.gz --- XMonad/Actions/TagWindows.hs | 5 ++--- XMonad/Hooks/XPropManage.hs | 5 ++--- XMonad/Layout/WorkspaceDir.hs | 1 - XMonad/Prompt.hs | 10 ++++------ XMonad/Prompt/DirExec.hs | 5 ++--- XMonad/Prompt/RunOrRaise.hs | 5 ++--- XMonad/Prompt/Shell.hs | 7 +++---- XMonad/Prompt/Ssh.hs | 6 ++---- XMonad/Util/Font.hs | 7 +++---- XMonad/Util/Loggers.hs | 5 ++--- XMonad/Util/NamedWindows.hs | 7 +++---- 11 files changed, 25 insertions(+), 38 deletions(-) (limited to 'XMonad') diff --git a/XMonad/Actions/TagWindows.hs b/XMonad/Actions/TagWindows.hs index 10331fe..86c2e9e 100644 --- a/XMonad/Actions/TagWindows.hs +++ b/XMonad/Actions/TagWindows.hs @@ -26,10 +26,9 @@ module XMonad.Actions.TagWindows ( TagPrompt, ) where -import Prelude hiding (catch) import Data.List (nub,sortBy) import Control.Monad -import Control.Exception +import Control.Exception as E import XMonad.StackSet hiding (filter) @@ -82,7 +81,7 @@ setTag s w = withDisplay $ \d -> -- reads from the \"_XMONAD_TAGS\" window property getTags :: Window -> X [String] getTags w = withDisplay $ \d -> - io $ catch (internAtom d "_XMONAD_TAGS" False >>= + io $ E.catch (internAtom d "_XMONAD_TAGS" False >>= getTextProperty d w >>= wcTextPropertyToTextList d) (econst [[]]) diff --git a/XMonad/Hooks/XPropManage.hs b/XMonad/Hooks/XPropManage.hs index 8c2af48..1f94b92 100644 --- a/XMonad/Hooks/XPropManage.hs +++ b/XMonad/Hooks/XPropManage.hs @@ -18,8 +18,7 @@ module XMonad.Hooks.XPropManage ( xPropManageHook, XPropMatch, pmX, pmP ) where -import Prelude hiding (catch) -import Control.Exception +import Control.Exception as E import Data.Char (chr) import Data.Monoid (mconcat, Endo(..)) @@ -76,7 +75,7 @@ xPropManageHook tms = mconcat $ map propToHook tms getProp :: Display -> Window -> Atom -> X ([String]) getProp d w p = do - prop <- io $ catch (getTextProperty d w p >>= wcTextPropertyToTextList d) (\(_ :: IOException) -> return [[]]) + prop <- io $ E.catch (getTextProperty d w p >>= wcTextPropertyToTextList d) (\(_ :: IOException) -> return [[]]) let filt q | q == wM_COMMAND = concat . map splitAtNull | otherwise = id return (filt p prop) diff --git a/XMonad/Layout/WorkspaceDir.hs b/XMonad/Layout/WorkspaceDir.hs index 89b124b..b844cf0 100644 --- a/XMonad/Layout/WorkspaceDir.hs +++ b/XMonad/Layout/WorkspaceDir.hs @@ -29,7 +29,6 @@ module XMonad.Layout.WorkspaceDir ( WorkspaceDir, ) where -import Prelude hiding (catch) import System.Directory ( setCurrentDirectory, getCurrentDirectory ) import Control.Monad ( when ) diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs index daa1809..90509d5 100644 --- a/XMonad/Prompt.hs +++ b/XMonad/Prompt.hs @@ -68,8 +68,6 @@ module XMonad.Prompt , XPState ) where -import Prelude hiding (catch) - import XMonad hiding (cleanMask, config) import qualified XMonad as X (numberlockMask) import qualified XMonad.StackSet as W @@ -81,7 +79,7 @@ import Codec.Binary.UTF8.String (decodeString) import Control.Applicative ((<$>)) import Control.Arrow (first, (&&&), (***)) import Control.Concurrent (threadDelay) -import Control.Exception.Extensible hiding (handle) +import Control.Exception.Extensible as E hiding (handle) import Control.Monad.State import Data.Bits import Data.Char (isSpace) @@ -890,7 +888,7 @@ getCompletions :: XP [String] getCompletions = do s <- get io $ getCompletionFunction s (commandToComplete (currentXPMode s) (command s)) - `catch` \(SomeException _) -> return [] + `E.catch` \(SomeException _) -> return [] setComplWin :: Window -> ComplWindowDim -> XP () setComplWin w wi = @@ -1028,7 +1026,7 @@ getHistoryFile :: IO FilePath getHistoryFile = fmap (++ "/history") $ getAppUserDataDirectory "xmonad" readHistory :: IO History -readHistory = readHist `catch` \(SomeException _) -> return emptyHistory +readHistory = readHist `E.catch` \(SomeException _) -> return emptyHistory where readHist = do path <- getHistoryFile @@ -1039,7 +1037,7 @@ writeHistory :: History -> IO () writeHistory hist = do path <- getHistoryFile let filtered = M.filter (not . null) hist - writeFile path (show filtered) `catch` \(SomeException e) -> + writeFile path (show filtered) `E.catch` \(SomeException e) -> hPutStrLn stderr ("error writing history: "++show e) setFileMode path mode where mode = ownerReadMode .|. ownerWriteMode diff --git a/XMonad/Prompt/DirExec.hs b/XMonad/Prompt/DirExec.hs index ddcc8c5..ef37a9a 100644 --- a/XMonad/Prompt/DirExec.hs +++ b/XMonad/Prompt/DirExec.hs @@ -24,8 +24,7 @@ module XMonad.Prompt.DirExec , DirExec ) where -import Prelude hiding (catch) -import Control.Exception +import Control.Exception as E import System.Directory import Control.Monad import Data.List @@ -104,4 +103,4 @@ getDirectoryExecutables path = liftM2 (&&) (doesFileExist x') (liftM executable (getPermissions x')))) - `catch` econst [] + `E.catch` econst [] diff --git a/XMonad/Prompt/RunOrRaise.hs b/XMonad/Prompt/RunOrRaise.hs index 8fb5c43..ce93de9 100644 --- a/XMonad/Prompt/RunOrRaise.hs +++ b/XMonad/Prompt/RunOrRaise.hs @@ -26,8 +26,7 @@ import XMonad.Prompt.Shell import XMonad.Actions.WindowGo (runOrRaise) import XMonad.Util.Run (runProcessWithInput) -import Prelude hiding (catch) -import Control.Exception +import Control.Exception as E import Control.Monad (liftM, liftM2) import System.Directory (doesDirectoryExist, doesFileExist, executable, getPermissions) @@ -71,7 +70,7 @@ isApp "thunderbird" = className =? "Thunderbird-bin" <||> className =? "Thunderb isApp x = liftM2 (==) pid $ pidof x pidof :: String -> Query Int -pidof x = io $ (runProcessWithInput "pidof" [x] [] >>= readIO) `catch` econst 0 +pidof x = io $ (runProcessWithInput "pidof" [x] [] >>= readIO) `E.catch` econst 0 pid :: Query Int pid = ask >>= (\w -> liftX $ withDisplay $ \d -> getPID d w) diff --git a/XMonad/Prompt/Shell.hs b/XMonad/Prompt/Shell.hs index c391ca3..05ee5f4 100644 --- a/XMonad/Prompt/Shell.hs +++ b/XMonad/Prompt/Shell.hs @@ -30,10 +30,9 @@ module XMonad.Prompt.Shell ) where import Codec.Binary.UTF8.String (encodeString) -import Control.Exception +import Control.Exception as E import Control.Monad (forM) import Data.List (isPrefixOf) -import Prelude hiding (catch) import System.Directory (doesDirectoryExist, getDirectoryContents) import System.Environment (getEnv) import System.Posix.Files (getFileStatus, isDirectory) @@ -111,7 +110,7 @@ commandCompletionFunction cmds str | '/' `elem` str = [] getCommands :: IO [String] getCommands = do - p <- getEnv "PATH" `catch` econst [] + p <- getEnv "PATH" `E.catch` econst [] let ds = filter (/= "") $ split ':' p es <- forM ds $ \d -> do exists <- doesDirectoryExist d @@ -142,7 +141,7 @@ isSpecialChar = flip elem " &\\@\"'#?$*()[]{};" -- In order to /set/ an environment variable (eg. combine with a prompt so you can modify @$HTTP_PROXY@ dynamically), -- you need to use 'System.Posix.putEnv'. env :: String -> String -> IO String -env variable fallthrough = getEnv variable `catch` econst fallthrough +env variable fallthrough = getEnv variable `E.catch` econst fallthrough {- | Ask the shell what browser the user likes. If the user hasn't defined any $BROWSER, defaults to returning \"firefox\", since that seems to be the most diff --git a/XMonad/Prompt/Ssh.hs b/XMonad/Prompt/Ssh.hs index c3a035d..e9e7ec8 100644 --- a/XMonad/Prompt/Ssh.hs +++ b/XMonad/Prompt/Ssh.hs @@ -19,15 +19,13 @@ module XMonad.Prompt.Ssh Ssh, ) where -import Prelude hiding (catch) - import XMonad import XMonad.Util.Run import XMonad.Prompt import System.Directory import System.Environment -import Control.Exception +import Control.Exception as E import Control.Monad import Data.Maybe @@ -78,7 +76,7 @@ sshComplListLocal = do sshComplListGlobal :: IO [String] sshComplListGlobal = do - env <- getEnv "SSH_KNOWN_HOSTS" `catch` econst "/nonexistent" + env <- getEnv "SSH_KNOWN_HOSTS" `E.catch` econst "/nonexistent" fs <- mapM fileExists [ env , "/usr/local/etc/ssh/ssh_known_hosts" , "/usr/local/etc/ssh_known_hosts" diff --git a/XMonad/Util/Font.hs b/XMonad/Util/Font.hs index 7f66c75..031a706 100644 --- a/XMonad/Util/Font.hs +++ b/XMonad/Util/Font.hs @@ -32,11 +32,10 @@ module XMonad.Util.Font , fi ) where -import Prelude hiding (catch) import XMonad import Foreign import Control.Applicative -import Control.Exception +import Control.Exception as E import Data.Maybe #ifdef XFT @@ -70,7 +69,7 @@ econst = const initCoreFont :: String -> X FontStruct initCoreFont s = do d <- asks display - io $ catch (getIt d) (fallBack d) + io $ E.catch (getIt d) (fallBack d) where getIt d = loadQueryFont d s fallBack d = econst $ loadQueryFont d "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*" @@ -82,7 +81,7 @@ releaseCoreFont fs = do initUtf8Font :: String -> X FontSet initUtf8Font s = do d <- asks display - (_,_,fs) <- io $ catch (getIt d) (fallBack d) + (_,_,fs) <- io $ E.catch (getIt d) (fallBack d) return fs where getIt d = createFontSet d s fallBack d = econst $ createFontSet d "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*" diff --git a/XMonad/Util/Loggers.hs b/XMonad/Util/Loggers.hs index 19e6eae..36f91d9 100644 --- a/XMonad/Util/Loggers.hs +++ b/XMonad/Util/Loggers.hs @@ -52,9 +52,8 @@ import XMonad.Hooks.DynamicLog import XMonad.Util.Font (Align (..)) import XMonad.Util.NamedWindows (getName) -import Prelude hiding (catch) import Control.Applicative ((<$>)) -import Control.Exception +import Control.Exception as E import Data.List (isPrefixOf, isSuffixOf) import Data.Maybe (fromMaybe) import Data.Traversable (traverse) @@ -143,7 +142,7 @@ loadAvg = logCmd "/usr/bin/uptime | sed 's/.*: //; s/,//g'" -- | Create a 'Logger' from an arbitrary shell command. logCmd :: String -> Logger logCmd c = io $ do (_, out, _, _) <- runInteractiveCommand c - fmap Just (hGetLine out) `catch` econst Nothing + fmap Just (hGetLine out) `E.catch` econst Nothing -- no need to waitForProcess, we ignore SIGCHLD -- | Get a count of filtered files in a directory. diff --git a/XMonad/Util/NamedWindows.hs b/XMonad/Util/NamedWindows.hs index 653eb54..61176d5 100644 --- a/XMonad/Util/NamedWindows.hs +++ b/XMonad/Util/NamedWindows.hs @@ -22,9 +22,8 @@ module XMonad.Util.NamedWindows ( unName ) where -import Prelude hiding ( catch ) import Control.Applicative ( (<$>) ) -import Control.Exception.Extensible ( bracket, catch, SomeException(..) ) +import Control.Exception.Extensible as E import Data.Maybe ( fromMaybe, listToMaybe ) import qualified XMonad.StackSet as W ( peek ) @@ -50,11 +49,11 @@ getName w = withDisplay $ \d -> do let getIt = bracket getProp (xFree . tp_value) (fmap (`NW` w) . copy) getProp = (internAtom d "_NET_WM_NAME" False >>= getTextProperty d w) - `catch` \(SomeException _) -> getTextProperty d w wM_NAME + `E.catch` \(SomeException _) -> getTextProperty d w wM_NAME copy prop = fromMaybe "" . listToMaybe <$> wcTextPropertyToTextList d prop - io $ getIt `catch` \(SomeException _) -> ((`NW` w) . resName) `fmap` getClassHint d w + io $ getIt `E.catch` \(SomeException _) -> ((`NW` w) . resName) `fmap` getClassHint d w unName :: NamedWindow -> Window unName (NW _ w) = w -- cgit v1.2.3