diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-29 19:07:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-29 19:07:10 -0400 |
| commit | 86b3857a4c1edafef817935ad3c5d63e6d2d3b25 (patch) | |
| tree | 119204ef14b23c9b3d99b19888f4a63e8157d702 | |
| parent | a23b5c6e324068108043a999bb816379ec417bf2 (diff) | |
moved ThreadedMonad to Types
| -rw-r--r-- | Assistant.hs | 2 | ||||
| -rw-r--r-- | Assistant/Monad.hs | 3 | ||||
| -rw-r--r-- | Assistant/Threads/WebApp.hs | 2 | ||||
| -rw-r--r-- | Assistant/Types/ThreadedMonad.hs (renamed from Assistant/ThreadedMonad.hs) | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Assistant.hs b/Assistant.hs index a8cc0b62e..3ef7c9a11 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -118,8 +118,8 @@ module Assistant where import Assistant.Common -import Assistant.ThreadedMonad import Assistant.DaemonStatus +import Assistant.Types.ThreadedMonad import Assistant.Threads.DaemonStatus import Assistant.Threads.Watcher import Assistant.Threads.Committer diff --git a/Assistant/Monad.hs b/Assistant/Monad.hs index 1f8ccacbe..c13d3a372 100644 --- a/Assistant/Monad.hs +++ b/Assistant/Monad.hs @@ -26,7 +26,7 @@ import "mtl" Control.Monad.Reader import Control.Monad.Base (liftBase, MonadBase) import Common.Annex -import Assistant.ThreadedMonad +import Assistant.Types.ThreadedMonad import Assistant.DaemonStatus import Assistant.ScanRemotes import Assistant.TransferQueue @@ -112,6 +112,7 @@ asIO2 a = do (<<~) :: (a -> IO b) -> (AssistantData -> a) -> Assistant b io <<~ v = reader v >>= liftIO . io +withAssistant :: (AssistantData -> a) -> (a -> IO b) -> Assistant b withAssistant v io = io <<~ v daemonStatus :: Assistant DaemonStatus diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs index 126c78166..be9a9a16f 100644 --- a/Assistant/Threads/WebApp.hs +++ b/Assistant/Threads/WebApp.hs @@ -27,7 +27,7 @@ import Assistant.WebApp.Configurators.S3 import Assistant.WebApp.Configurators.XMPP import Assistant.WebApp.Documentation import Assistant.WebApp.OtherRepos -import Assistant.ThreadedMonad +import Assistant.Types.ThreadedMonad import Utility.WebApp import Utility.FileMode import Utility.TempFile diff --git a/Assistant/ThreadedMonad.hs b/Assistant/Types/ThreadedMonad.hs index 7b915e12c..1a2aa7eb7 100644 --- a/Assistant/ThreadedMonad.hs +++ b/Assistant/Types/ThreadedMonad.hs @@ -5,7 +5,7 @@ - Licensed under the GNU GPL version 3 or higher. -} -module Assistant.ThreadedMonad where +module Assistant.Types.ThreadedMonad where import Common.Annex import qualified Annex |