diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2012-05-05 21:34:02 +0200 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2012-05-05 21:34:02 +0200 |
| commit | 3e897e71c289dcfe6d1a039e6e048c82863006c0 (patch) | |
| tree | d6210427a032c71a03a48ff66c21108655bc3e41 /src/Plugins | |
| parent | f94d6a31fc43f9e3ff3313471912602e616aafd4 (diff) | |
| download | xmobar-3e897e71c289dcfe6d1a039e6e048c82863006c0.tar.gz xmobar-3e897e71c289dcfe6d1a039e6e048c82863006c0.tar.bz2 | |
Duplicate instance definition (github issue #45)
Diffstat (limited to 'src/Plugins')
| -rw-r--r-- | src/Plugins/Monitors/CoreCommon.hs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/Plugins/Monitors/CoreCommon.hs b/src/Plugins/Monitors/CoreCommon.hs index f866d31..a18697f 100644 --- a/src/Plugins/Monitors/CoreCommon.hs +++ b/src/Plugins/Monitors/CoreCommon.hs @@ -25,19 +25,10 @@ import Data.Maybe import Plugins.Monitors.Common import System.Directory -#ifdef GHC6 -import Control.Monad.Reader - -instance (Monad f, Applicative f) => Applicative (ReaderT r f) where - pure a = ReaderT $ const (pure a) - f <*> a = ReaderT $ \r -> - ((runReaderT f r) <*> (runReaderT a r)) -#endif - checkedDataRetrieval :: (Ord a, Num a) => String -> [String] -> Maybe (String, String -> Int) -> (Double -> a) -> (a -> String) -> Monitor String -checkedDataRetrieval msg path lbl trans fmt = liftM (maybe msg id) $ +checkedDataRetrieval msg path lbl trans fmt = liftM (fromMaybe msg) $ retrieveData path lbl trans fmt retrieveData :: (Ord a, Num a) |