From d9ecd1eb9d1333d0805fa1d9a980fd41a5024dfb Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 25 Mar 2022 20:28:34 -1000 Subject: [PATCH] imp: update to modern warning flags --- Makefile | 10 +++++----- hledger-lib/hledger-lib.cabal | 6 +++--- hledger-lib/package.yaml | 12 ++++++------ hledger-ui/hledger-ui.cabal | 2 +- hledger-ui/package.yaml | 10 +++++----- hledger-web/hledger-web.cabal | 6 +++--- hledger-web/package.yaml | 2 +- hledger/hledger.cabal | 8 ++++---- hledger/package.yaml | 10 +++++----- stack9.2.yaml | 2 +- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index 6157a5827..831a7b167 100644 --- a/Makefile +++ b/Makefile @@ -203,11 +203,11 @@ VERSION=$(shell cat hledger/.version) WARNINGS:=\ -Wall \ - -fno-warn-unused-do-bind \ - -fno-warn-name-shadowing \ - -fno-warn-missing-signatures \ - -fno-warn-orphans \ - -fno-warn-type-defaults \ + -Wno-unused-do-bind \ + -Wno-name-shadowing \ + -Wno-missing-signatures \ + -Wno-orphans \ + -Wno-type-defaults \ # if you have need to try building in less memory # GHCLOWMEMFLAGS= #+RTS -M200m -RTS diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 2a6d61a33..3f28eca90 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -91,7 +91,7 @@ library Paths_hledger_lib hs-source-dirs: ./ - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -fno-warn-incomplete-uni-patterns + ghc-options: -Wall -Wno-unused-do-bind -Wno-name-shadowing -Wno-missing-signatures -Wno-type-defaults -Wno-orphans -Wno-incomplete-uni-patterns build-depends: Decimal >=0.5.1 , Glob >=0.9 @@ -141,7 +141,7 @@ test-suite doctest hs-source-dirs: ./ test - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -fno-warn-incomplete-uni-patterns + ghc-options: -Wall -Wno-unused-do-bind -Wno-name-shadowing -Wno-missing-signatures -Wno-type-defaults -Wno-orphans -Wno-incomplete-uni-patterns build-depends: Decimal >=0.5.1 , Glob >=0.7 @@ -194,7 +194,7 @@ test-suite unittest hs-source-dirs: ./ test - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -fno-warn-incomplete-uni-patterns + ghc-options: -Wall -Wno-unused-do-bind -Wno-name-shadowing -Wno-missing-signatures -Wno-type-defaults -Wno-orphans -Wno-incomplete-uni-patterns build-depends: Decimal >=0.5.1 , Glob >=0.9 diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index ee723bb7e..2db2ad2df 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -79,13 +79,13 @@ dependencies: ghc-options: - -Wall -- -fno-warn-unused-do-bind -- -fno-warn-name-shadowing -- -fno-warn-missing-signatures -- -fno-warn-type-defaults -- -fno-warn-orphans +- -Wno-unused-do-bind +- -Wno-name-shadowing +- -Wno-missing-signatures +- -Wno-type-defaults +- -Wno-orphans # XXX seems new in 9.2, fix these -- -fno-warn-incomplete-uni-patterns +- -Wno-incomplete-uni-patterns source-dirs: #- other/ledger-parse diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index d2da958ed..c0beae8cd 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/hledger-ui/hledger-ui.cabal @@ -62,7 +62,7 @@ executable hledger-ui Paths_hledger_ui hs-source-dirs: ./ - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans + ghc-options: -Wall -Wno-unused-do-bind -Wno-name-shadowing -Wno-missing-signatures -Wno-type-defaults -Wno-orphans cpp-options: -DVERSION="1.25.99" build-depends: ansi-terminal >=0.9 diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index 258428015..8d9f48122 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -94,11 +94,11 @@ executables: main: hledger-ui.hs ghc-options: -Wall - -fno-warn-unused-do-bind - -fno-warn-name-shadowing - -fno-warn-missing-signatures - -fno-warn-type-defaults - -fno-warn-orphans + -Wno-unused-do-bind + -Wno-name-shadowing + -Wno-missing-signatures + -Wno-type-defaults + -Wno-orphans when: - condition: flag(threaded) ghc-options: -threaded diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index a9f2c75a3..699ea6026 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -150,7 +150,7 @@ library Paths_hledger_web hs-source-dirs: ./ - ghc-options: -Wall -fwarn-tabs -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints + ghc-options: -Wall -Wtabs -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints cpp-options: -DVERSION="1.25.99" build-depends: Decimal >=0.5.1 @@ -211,7 +211,7 @@ executable hledger-web Paths_hledger_web hs-source-dirs: app - ghc-options: -Wall -fwarn-tabs -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints + ghc-options: -Wall -Wtabs -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints cpp-options: -DVERSION="1.25.99" build-depends: base @@ -231,7 +231,7 @@ test-suite test main-is: test.hs hs-source-dirs: test - ghc-options: -Wall -fwarn-tabs -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints + ghc-options: -Wall -Wtabs -Wcompat -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints cpp-options: -DVERSION="1.25.99" build-depends: base diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 63bb861f8..e43a07e54 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -62,7 +62,7 @@ flags: ghc-options: - -Wall -- -fwarn-tabs +- -Wtabs - -Wcompat - -Wincomplete-uni-patterns - -Wincomplete-record-updates diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 763a3b9e6..5817c30a6 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -135,7 +135,7 @@ library Hledger.Cli.CompoundBalanceCommand other-modules: Paths_hledger - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path + ghc-options: -Wall -Wno-unused-do-bind -Wno-name-shadowing -Wno-missing-signatures -Wno-type-defaults -Wno-orphans -optP-Wno-nonportable-include-path cpp-options: -DVERSION="1.25.99" build-depends: Decimal >=0.5.1 @@ -186,7 +186,7 @@ executable hledger Paths_hledger hs-source-dirs: app - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path + ghc-options: -Wall -Wno-unused-do-bind -Wno-name-shadowing -Wno-missing-signatures -Wno-type-defaults -Wno-orphans -optP-Wno-nonportable-include-path cpp-options: -DVERSION="1.25.99" build-depends: Decimal >=0.5.1 @@ -236,7 +236,7 @@ test-suite unittest main-is: unittest.hs hs-source-dirs: test - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path + ghc-options: -Wall -Wno-unused-do-bind -Wno-name-shadowing -Wno-missing-signatures -Wno-type-defaults -Wno-orphans -optP-Wno-nonportable-include-path cpp-options: -DVERSION="1.25.99" build-depends: Decimal >=0.5.1 @@ -284,7 +284,7 @@ benchmark bench main-is: bench.hs hs-source-dirs: bench - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path + ghc-options: -Wall -Wno-unused-do-bind -Wno-name-shadowing -Wno-missing-signatures -Wno-type-defaults -Wno-orphans -optP-Wno-nonportable-include-path build-depends: Decimal >=0.5.1 , aeson >=1 diff --git a/hledger/package.yaml b/hledger/package.yaml index 5a791d8b9..55e5c7c52 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -87,11 +87,11 @@ flags: ghc-options: - -Wall -- -fno-warn-unused-do-bind -- -fno-warn-name-shadowing -- -fno-warn-missing-signatures -- -fno-warn-type-defaults -- -fno-warn-orphans +- -Wno-unused-do-bind +- -Wno-name-shadowing +- -Wno-missing-signatures +- -Wno-type-defaults +- -Wno-orphans # avoid "non-portable path" warning on mac, https://github.com/commercialhaskell/stack/issues/3918 - -optP-Wno-nonportable-include-path diff --git a/stack9.2.yaml b/stack9.2.yaml index ef9f84ea0..d9f72cfef 100644 --- a/stack9.2.yaml +++ b/stack9.2.yaml @@ -26,7 +26,7 @@ extra-deps: # silence new warnings temporarily ghc-options: - "$locals": -Wno-deprecations -Wno-incomplete-uni-patterns -Wno-incomplete-record-updates + "$locals": -Wno-incomplete-uni-patterns -Wno-incomplete-record-updates nix: pure: false