simplified a bunch of Maybe handling

1 files changed, 4 insertions, 7 deletions

diff --git a/Utility.hs b/Utility.hs
index 0dab37104..44c8cdd65 100644
--- a/Utility.hs
+++ b/Utility.hs
@@ -165,9 +165,7 @@ prop_parentDir_basics dir
 dirContains :: FilePath -> FilePath -> Bool
 dirContains a b = a == b || a' == b' || (a'++"/") `isPrefixOf` b'
 	where
-		norm p = case (absNormPath p ".") of
-			Just r -> r
-			Nothing -> ""
+		norm p = maybe "" id $ absNormPath p "."
 		a' = norm a
 		b' = norm b
 
@@ -180,10 +178,9 @@ absPath file = do
 {- Converts a filename into a normalized, absolute path
  - from the specified cwd. -}
 absPathFrom :: FilePath -> FilePath -> FilePath
-absPathFrom cwd file =
-	case absNormPath cwd file of
-		Just f -> f
-		Nothing -> error $ "unable to normalize " ++ file
+absPathFrom cwd file = maybe bad id $ absNormPath cwd file
+	where
+		bad = error $ "unable to normalize " ++ file
 
 {- Constructs a relative path from the CWD to a file.
  -