git.iko.soy/elk
on master help sign in
Modify code to follow hlint suggestions
10f13d1Justin Leitgeb
server/Server.hs+6−5
compare with master
unifiedsplit
@@ -1,4 +1,3 @@
1−
2module Main where
1module Main where
3
2
4import Control.Monad (msum,guard,when)
3import Control.Monad (msum,guard,when)
@@ -64,7 +63,7 @@ serveElm fp = do
64 args = [ "--make" ,"--runtime=" ++ runtime,
63 args = [ "--make" ,"--runtime=" ++ runtime,
65 "--cache-dir=" ++ defaultCacheDirectory, file ]
64 "--cache-dir=" ++ defaultCacheDirectory, file ]
66
65
67−serveLib :: FilePath -> [Char] -> ServerPartT IO Response
66+serveLib :: FilePath -> String -> ServerPartT IO Response
68serveLib libLoc fp = do
67serveLib libLoc fp = do
69 guard (fp == runtime)
68 guard (fp == runtime)
70 serveFile (asContentType "application/javascript") libLoc
69 serveFile (asContentType "application/javascript") libLoc
@@ -76,9 +75,11 @@ parse :: [String] -> IO ()
76parse ("--help":_) = putStrLn usage
75parse ("--help":_) = putStrLn usage
77parse ("--version":_) = putStrLn ("The Elm Server " ++ showVersion version)
76parse ("--version":_) = putStrLn ("The Elm Server " ++ showVersion version)
78parse args =
77parse args =
79− case null remainingArgs of
78+ if null remainingArgs then
80− True -> serve portNumber =<< elmRuntime
79+ serve portNumber =<< elmRuntime
80+ else
81− False -> putStrLn usageMini
81+ putStrLn usageMini
82+
82 where
83 where
83 runtimeArg = filter (isPrefixOf "--runtime-location=") args
84 runtimeArg = filter (isPrefixOf "--runtime-location=") args
84 portArg = filter (isPrefixOf "--port=") args
85 portArg = filter (isPrefixOf "--port=") args