diff options
| author | David Waern <david.waern@gmail.com> | 2010-07-22 19:31:28 +0000 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2010-07-22 19:31:28 +0000 |
| commit | f1cfa186ffc6268508adb1e5768eacc1fd22f2d8 (patch) | |
| tree | 84124df25d9aae0158ad25be5096a5b5974a3a74 | |
| parent | a26d126c7457059d9d89d0cccacee8cc1136d59c (diff) | |
Solve conflict
| -rw-r--r-- | src/Haddock/Utils.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Haddock/Utils.hs b/src/Haddock/Utils.hs index 45c64e57..b5ef2f71 100644 --- a/src/Haddock/Utils.hs +++ b/src/Haddock/Utils.hs @@ -372,8 +372,9 @@ html_xrefs = unsafePerformIO (readIORef html_xrefs_ref) replace :: Eq a => a -> a -> [a] -> [a] replace a b = map (\x -> if x == a then b else x) + spanWith :: (a -> Maybe b) -> [a] -> ([b],[a]) -spanWith p [] = ([],[]) +spanWith _ [] = ([],[]) spanWith p xs@(a:as) | Just b <- p a = let (bs,cs) = spanWith p as in (b:bs,cs) | otherwise = ([],xs) |