X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=advent05%2FMain.hs;fp=advent05%2FMain.hs;h=21daf434eb0f17035f9b4542a926e88e56235291;hb=b64a6c258a1d149fc7438ce0513530bbca0b931c;hp=727822d430fb7f17d14aac9e4f40d526a7ddfe04;hpb=1ade0f990fca1907a65253cb0fe1c38a9bc1d3af;p=advent-of-code-22.git

diff --git a/advent05/Main.hs b/advent05/Main.hs
index 727822d..21daf43 100644
--- a/advent05/Main.hs
+++ b/advent05/Main.hs
@@ -52,9 +52,7 @@ extractName (Crate c) = c
 
 makeWharf :: [[Maybe Crate]] -> [Int] -> Wharf
 makeWharf wharfLines colNames = M.fromList $ zip colNames wharfCols
-  where wharfCols = fmap (fmap fromJust)
-                  $ fmap (dropWhile isNothing) 
-                  $ transpose wharfLines
+  where wharfCols = fmap catMaybes $ transpose wharfLines
 
 applyMoves1 :: Wharf -> [Move] -> Wharf
 applyMoves1 wharf moves = foldl' applyMove1 wharf moves