Merge release-5.5.0.0 into master (using imerge)

2016-01-17 21:03:28 +01:00
parent 5efa123f36 54fe4a0edb
commit 566dbebe29
20 changed files with 195 additions and 160 deletions
--- a/test/FindSpec.hs
+++ b/test/FindSpec.hs
@@ -2,7 +2,6 @@
 module FindSpec where

 import Language.Haskell.GhcMod.Find
-import Control.Monad
 import Test.Hspec
 import TestUtils

@@ -10,5 +9,5 @@ spec :: Spec
 spec = do
    describe "db <- loadSymbolDb" $ do
        it "lookupSymbol' db \"head\"  contains at least `Data.List'" $ do
-            db <- runD $ loadSymbolDb =<< (cradleTempDir `liftM` cradle)
+            db <- runD $ loadSymbolDb
            lookupSym "head" db `shouldContain` [ModuleString "Data.List"]