on master help sign in
Apply muse-dev suggestions from code review

Co-authored-by: muse-dev[bot] <37194012+muse-dev[bot]@users.noreply.github.com>

commit5b0cfe11c120bcde707811d37319524a9943538d authorMark Wotton <mwotton@gmail.com> dateMon 30 Nov 2020, 14:21 (6 years ago) parent2f97dc1
3 files changed+62−6
src/Roboservant/Direct.hs+50−6 src/Roboservant/Types/Breakdown.hs+8 test/Spec.hs+4
src/Roboservant/Direct.hs+50−6
@@ -20,8 +20,40 @@ module Roboservant.Direct
2020 )
2121where
2222
23−import Control.Exception.Lifted(throw,handle,Handler(..), Exception,SomeException,SomeAsyncException, catch, catches)
24−import Control.Monad.State.Strict(MonadState,MonadIO,get,modify',liftIO,runStateT)
23+import Control.Exception.Lifted
24+ ( throw,
25+ handle,
26+ Handler(..),
27+ Exception,
28+ SomeException,
29+ SomeAsyncException,
30+ catch,
31+ catches )
32+import Control.Exception.Lifted
33+ ( throw,
34+ Handler(..),
35+ Exception,
36+ SomeException,
37+ SomeAsyncException,
38+ catch,
39+ catches )
40+import Control.Exception.Lifted
41+ ( Exception,
42+ Handler(..),
43+ SomeAsyncException,
44+ SomeException,
45+ catch,
46+ catches,
47+ handle,
48+ throw )
49+
50+import Control.Monad.State.Strict
51+ ( MonadState, MonadIO, get, modify', liftIO, runStateT )
52+import Control.Monad.State.Strict
53+ ( MonadState, MonadIO, get, modify', liftIO, execStateT )
54+import Control.Monad.State.Strict
55+ ( MonadIO, MonadState, get, liftIO, modify', runStateT )
56+
2557import Control.Exception.Lifted(throw,Handler(..), Exception,SomeException,SomeAsyncException, catch, catches)
2658import Control.Monad(void,replicateM,forM_)
2759import Control.Monad.State.Strict(MonadState,MonadIO,get,modify',liftIO,execStateT)
@@ -33,17 +65,29 @@ import Data.Map.Strict(Map)
3365import qualified Data.Set as Set
3466import Data.Maybe (mapMaybe)
3567import Data.Typeable (TypeRep)
36−import Servant (Endpoints, Proxy (Proxy), Server, ServerError(..))
37−import System.Random(StdGen,randomR,mkStdGen)
68+import Servant ( Endpoints, Proxy(Proxy), Server, ServerError(..) )
69+import Servant ( Endpoints, Proxy(Proxy), Server, ServerError(..) )
70+
71+import System.Random ( StdGen, randomR, mkStdGen )
72+import System.Random ( StdGen, mkStdGen, randomR )
73+
3874import qualified Data.List.NonEmpty as NEL
3975import qualified Data.Map.Strict as Map
4076import Data.Time.Clock
77+import Data.Time.Clock
78+
4179import Data.List(sortOn)
4280import Control.Arrow(second)
4381import System.Timeout.Lifted(timeout)
44−import GHC.Generics ((:*:)(..))
82+import GHC.Generics ( (:*:)(..) )
83+import GHC.Generics ( (:*:)(..) )
84+
85+import qualified Data.Vinyl.Functor as V
4586import qualified Data.Vinyl.Functor as V
87+
4688import qualified Data.Vinyl.Curry as V
89+import qualified Data.Vinyl.Curry as V
90+
4791
4892
4993import Control.Exception.Lifted (Exception, Handler (..), SomeAsyncException, SomeException, catch, catches, handle, throw)
@@ -313,7 +357,7 @@ addToStash result stash =
313357 (case NEL.toList singleDyn of
314358 [([Provenance tr _], dyn)] ->
315359 l
316− <> pure (([Provenance tr (length (NEL.last l) + 1)], dyn))
360+(([Provenance tr (length (NEL.last l) + 1)], dyn))
317361 _ -> error "should be impossible")
318362
319363 (IntSet.union singleHash intSet)
src/Roboservant/Types/Breakdown.hs+8
@@ -1,9 +1,17 @@
11{-# LANGUAGE AllowAmbiguousTypes #-}
22{-# LANGUAGE DataKinds #-}
33{-# LANGUAGE DerivingVia #-}
4+{-# LANGUAGE DerivingVia #-}
5+
46{-# LANGUAGE StandaloneDeriving #-}
7+{-# LANGUAGE StandaloneDeriving #-}
8+
59{-# LANGUAGE FlexibleInstances #-}
10+{-# LANGUAGE FlexibleInstances #-}
11+
612{-# LANGUAGE GADTs #-}
13+{-# LANGUAGE GADTs #-}
14+
715{-# LANGUAGE DefaultSignatures #-}
816{-# LANGUAGE DerivingStrategies #-}
917{-# LANGUAGE FlexibleInstances #-}
test/Spec.hs+4
@@ -1,6 +1,10 @@
11{-# LANGUAGE OverloadedStrings #-}
22{-# LANGUAGE StandaloneDeriving #-}
3+{-# LANGUAGE StandaloneDeriving #-}
4+
35{-# LANGUAGE DerivingVia #-}
6+{-# LANGUAGE DerivingVia #-}
7+
48{-# LANGUAGE TypeApplications #-}
59{-# LANGUAGE LambdaCase #-}
610{-# LANGUAGE DerivingVia #-}