on master help sign in
obelisk-run: Clean lint
commit0839ea8e9e3df735a3be76183305a8873dbc9ef3 authorElliot Cameron <eacameron@gmail.com> dateFri 3 Jan 2020, 12:41 (7 years ago) parente222bc9
1 file changed+6−6
lib/command/src/Obelisk/Command/Run.hs+6−6
lib/command/src/Obelisk/Command/Run.hs+6−6
@@ -132,12 +132,12 @@ parseCabalPackage dir = do
132132 Right (DecodeResult hpackPackage _ _ _) -> do
133133 return $ Just $ renderPackage [] hpackPackage
134134 else do
135− putLog Error $ T.pack $ "Found neither cabal nor hpack file"
135+ putLog Error $ T.pack "Found neither cabal nor hpack file"
136136 return Nothing
137137
138138 fmap join $ forM mCabalContents $ \cabalContents -> do
139139 let (warnings, result) = runParseResult $ parseGenericPackageDescription $
140− toUTF8BS $ cabalContents
140+ toUTF8BS cabalContents
141141 mapM_ (putLog Warning) $ fmap (T.pack . show) warnings
142142 case result of
143143 Right gpkg -> do
@@ -186,16 +186,16 @@ withGhciScript pkgs f = do
186186 language = NE.toList $ fromMaybe (Haskell98 NE.:| []) $ NE.nonEmpty languageFromPkgs
187187 extensionsLine = if extensions == mempty
188188 then ""
189− else ":set " <> intercalate " " ((("-X" <>) . prettyShow) <$> extensions)
189+ else ":set " <> unwords (("-X" <>) . prettyShow <$> extensions)
190190 ghcOptions = concat $ mapMaybe (\case (GHC, xs) -> Just xs; _ -> Nothing) $
191191 packageInfos >>= _cabalPackageInfo_compilerOptions
192− dotGhci = unlines $
192+ dotGhci = unlines
193193 [ ":set -i" <> intercalate ":" (packageInfos >>= rootedSourceDirs)
194194 , case ghcOptions of
195195 [] -> ""
196− xs -> ":set " <> intercalate " " xs
196+ xs -> ":set " <> unwords xs
197197 , extensionsLine
198− , ":set " <> intercalate " " (("-X" <>) . prettyShow <$> language)
198+ , ":set " <> unwords (("-X" <>) . prettyShow <$> language)
199199 , ":load Backend Frontend"
200200 , "import Obelisk.Run"
201201 , "import qualified Frontend"