From 29afc2ff7bd0aa0d18bcab0e500fb029c4ff969d Mon Sep 17 00:00:00 2001 From: Jens Kadenbach Date: Mon, 5 Dec 2022 16:15:49 +0100 Subject: [PATCH] Cleanup --- aoc2022.cabal | 12 +++--------- package.yaml | 2 -- src/Day1.hs | 1 - src/Lib.hs | 18 ++++++++++++++++-- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/aoc2022.cabal b/aoc2022.cabal index 612dbe5..cf122c0 100644 --- a/aoc2022.cabal +++ b/aoc2022.cabal @@ -50,8 +50,7 @@ library src ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints build-depends: - QuickCheck - , Ranged-sets + Ranged-sets , base >=4.7 && <5 , containers , heredoc @@ -59,7 +58,6 @@ library , lens , split , text - , these default-language: Haskell2010 executable aoc2022-exe @@ -70,8 +68,7 @@ executable aoc2022-exe app ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N build-depends: - QuickCheck - , Ranged-sets + Ranged-sets , aoc2022 , base >=4.7 && <5 , containers @@ -80,7 +77,6 @@ executable aoc2022-exe , lens , split , text - , these default-language: Haskell2010 test-suite aoc2022-test @@ -97,8 +93,7 @@ test-suite aoc2022-test test ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N build-depends: - QuickCheck - , Ranged-sets + Ranged-sets , aoc2022 , base >=4.7 && <5 , containers @@ -107,5 +102,4 @@ test-suite aoc2022-test , lens , split , text - , these default-language: Haskell2010 diff --git a/package.yaml b/package.yaml index df41e1f..bcfe013 100644 --- a/package.yaml +++ b/package.yaml @@ -22,7 +22,6 @@ description: Please see the README on GitHub at = 4.7 && < 5 - hspec -- QuickCheck - text - split - heredoc @@ -30,7 +29,6 @@ dependencies: - split - lens - Ranged-sets -- these ghc-options: - -Wall diff --git a/src/Day1.hs b/src/Day1.hs index cd608ee..8452304 100644 --- a/src/Day1.hs +++ b/src/Day1.hs @@ -14,7 +14,6 @@ day1 = do putStrLn ("Highest calorie count = " ++ calorieCount) caloriesOfTop3Elves <- day1_2 putStrLn ("Calories of top 3 elves = " ++ caloriesOfTop3Elves) - putStrLn "-----------" day1_1 :: IO String diff --git a/src/Lib.hs b/src/Lib.hs index 2b3014f..354a2f8 100644 --- a/src/Lib.hs +++ b/src/Lib.hs @@ -2,8 +2,22 @@ module Lib ( someFunc ) where -import Day5 +import Day1 +import Day2 +import Day3 +import Day4 +import Day5 someFunc :: IO () -someFunc = day5 +someFunc = do + day1 + putStrLn "-----------" + day2 + putStrLn "-----------" + day3 + putStrLn "-----------" + day4 + putStrLn "-----------" + day5 +