diff options
| author | Daniel Firth <locallycompact@gmail.com> | 2018-06-29 14:53:41 +0100 |
|---|---|---|
| committer | Daniel Firth <locallycompact@gmail.com> | 2018-07-04 09:50:16 +0100 |
| commit | f5994214ccf25be5d0b46159184f87fbc1481050 (patch) | |
| tree | 3ea7850b52563727f87bbbc19126ea250b803e67 | |
| parent | e5b68e4909cdb4c9b13a4855c4609df592346897 (diff) | |
Fix hlint errors in Monitor.hs, Noninteractive.hs and Regions.hs
| -rw-r--r-- | Bustle/Monitor.hs | 2 | ||||
| -rw-r--r-- | Bustle/Noninteractive.hs | 4 | ||||
| -rw-r--r-- | Bustle/Regions.hs | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Bustle/Monitor.hs b/Bustle/Monitor.hs index 53369a9..cb9d4ef 100644 --- a/Bustle/Monitor.hs +++ b/Bustle/Monitor.hs @@ -95,7 +95,7 @@ monitorNew target filename = monitorStop :: Monitor -> IO () -monitorStop monitor = do +monitorStop monitor = withForeignPtr (unMonitor monitor) bustle_pcap_monitor_stop messageLoggedHandler :: (Microseconds -> BS.ByteString -> IO ()) diff --git a/Bustle/Noninteractive.hs b/Bustle/Noninteractive.hs index b96b87f..215fc28 100644 --- a/Bustle/Noninteractive.hs +++ b/Bustle/Noninteractive.hs @@ -48,7 +48,7 @@ process filepath analyze format = do warn $ printf (__ "Couldn't parse '%s': %s") filepath err exitFailure Right (warnings, log) -> do - mapM warn warnings + mapM_ warn warnings mapM_ (putStrLn . format) $ analyze log formatInterface :: Maybe InterfaceName -> String @@ -82,5 +82,5 @@ runDot filepath = process filepath makeDigraph id | (s, d) <- nub . mapMaybe (methodCall . deEvent) $ log ] - methodCall (MessageEvent (MethodCall {sender = s, destination = d})) = Just (s, d) + methodCall (MessageEvent MethodCall {sender = s, destination = d}) = Just (s, d) methodCall _ = Nothing diff --git a/Bustle/Regions.hs b/Bustle/Regions.hs index 43b4e06..09b6f16 100644 --- a/Bustle/Regions.hs +++ b/Bustle/Regions.hs @@ -86,15 +86,15 @@ hits y stripe = y `relativeTo` stripe == EQ nonOverlapping :: [Stripe] -> Bool nonOverlapping [] = True -nonOverlapping (_:[]) = True +nonOverlapping [_] = True nonOverlapping (s1:s2:ss) = stripeBottom s1 <= stripeTop s2 && nonOverlapping (s2:ss) regionSelectionNew :: Regions a -> RegionSelection a regionSelectionNew rs - | sorted /= map fst rs = error $ "regionSelectionNew: unsorted regions" - | not (nonOverlapping sorted) = error $ "regionSelectionNew: overlapping regions" + | sorted /= map fst rs = error "regionSelectionNew: unsorted regions" + | not (nonOverlapping sorted) = error "regionSelectionNew: overlapping regions" | otherwise = RegionSelection [] 0 Nothing rs where sorted = sort (map fst rs) @@ -169,7 +169,7 @@ regionSelectionDown = invert . regionSelectionUp . invert regionSelectionFirst :: RegionSelection a -> RegionSelection a regionSelectionFirst rs = - case (reverse (rsBefore rs) ++ maybeToList (rsCurrent rs) ++ rsAfter rs) of + case reverse (rsBefore rs) ++ maybeToList (rsCurrent rs) ++ rsAfter rs of [] -> rs (first:others) -> RegionSelection [] (midpoint (fst first)) |