diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +0.9.4 +----- +* Fix misbehaving argument handling of 'dump' command + 0.9.3 ----- * Support GHC 7.10.1 diff --git a/cabal-bounds.cabal b/cabal-bounds.cabal --- a/cabal-bounds.cabal +++ b/cabal-bounds.cabal @@ -1,5 +1,5 @@ name: cabal-bounds -version: 0.9.3 +version: 0.9.4 cabal-version: >=1.9.2 build-type: Simple license: BSD3 diff --git a/lib/CabalBounds/Args.hs b/lib/CabalBounds/Args.hs --- a/lib/CabalBounds/Args.hs +++ b/lib/CabalBounds/Args.hs @@ -1,5 +1,5 @@ {-# LANGUAGE DeriveDataTypeable, CPP #-} -{-# OPTIONS_GHC -w #-} +{-# OPTIONS_GHC -w -fno-cse #-} module CabalBounds.Args ( Args(..) @@ -152,7 +152,7 @@ dumpArgs = Dump { output = def &= explicit &= typ "FILE" &= name "output" &= name "o" &= help "Save libraries with lower bounds to file, if empty, then it's written to stdout." - , cabalFiles = def &= args &= typ "CABAL_FILE" + , cabalFiles = def &= args &= typ "CABAL-FILE" } diff --git a/tests/goldenFiles/DropBothIgnoreBase.cabal b/tests/goldenFiles/DropBothIgnoreBase.cabal --- a/tests/goldenFiles/DropBothIgnoreBase.cabal +++ b/tests/goldenFiles/DropBothIgnoreBase.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs -any, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs -any, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs -any, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs -any, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs -any, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropBothOfAll.cabal b/tests/goldenFiles/DropBothOfAll.cabal --- a/tests/goldenFiles/DropBothOfAll.cabal +++ b/tests/goldenFiles/DropBothOfAll.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base -any, cmdargs -any, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base -any, cmdargs -any, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base -any, cmdargs -any, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base -any, cmdargs -any, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base -any, cmdargs -any, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropBothOfAllExes.cabal b/tests/goldenFiles/DropBothOfAllExes.cabal --- a/tests/goldenFiles/DropBothOfAllExes.cabal +++ b/tests/goldenFiles/DropBothOfAllExes.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base -any, cmdargs -any, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base -any, cmdargs -any, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropBothOfExe.cabal b/tests/goldenFiles/DropBothOfExe.cabal --- a/tests/goldenFiles/DropBothOfExe.cabal +++ b/tests/goldenFiles/DropBothOfExe.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base -any, cmdargs -any, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropBothOfLib.cabal b/tests/goldenFiles/DropBothOfLib.cabal --- a/tests/goldenFiles/DropBothOfLib.cabal +++ b/tests/goldenFiles/DropBothOfLib.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base -any, cmdargs -any, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropBothOfOtherExe.cabal b/tests/goldenFiles/DropBothOfOtherExe.cabal --- a/tests/goldenFiles/DropBothOfOtherExe.cabal +++ b/tests/goldenFiles/DropBothOfOtherExe.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base -any, cmdargs -any, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropBothOfTest.cabal b/tests/goldenFiles/DropBothOfTest.cabal --- a/tests/goldenFiles/DropBothOfTest.cabal +++ b/tests/goldenFiles/DropBothOfTest.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base -any, cmdargs -any, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropBothOnlyBase.cabal b/tests/goldenFiles/DropBothOnlyBase.cabal --- a/tests/goldenFiles/DropBothOnlyBase.cabal +++ b/tests/goldenFiles/DropBothOnlyBase.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base -any, cmdargs >=0.10.5 && <0.11, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base -any, cmdargs >=0.10.5 && <0.11, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base -any, cmdargs >=0.10.5 && <0.11, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base -any, cmdargs >=0.10.5 && <0.11, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base -any, cmdargs >=0.10.5 && <0.11, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperIgnoreBase.cabal b/tests/goldenFiles/DropUpperIgnoreBase.cabal --- a/tests/goldenFiles/DropUpperIgnoreBase.cabal +++ b/tests/goldenFiles/DropUpperIgnoreBase.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperOfAll.cabal b/tests/goldenFiles/DropUpperOfAll.cabal --- a/tests/goldenFiles/DropUpperOfAll.cabal +++ b/tests/goldenFiles/DropUpperOfAll.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base >=3, cmdargs >=0.10.5, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperOfAllExes.cabal b/tests/goldenFiles/DropUpperOfAllExes.cabal --- a/tests/goldenFiles/DropUpperOfAllExes.cabal +++ b/tests/goldenFiles/DropUpperOfAllExes.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperOfExe.cabal b/tests/goldenFiles/DropUpperOfExe.cabal --- a/tests/goldenFiles/DropUpperOfExe.cabal +++ b/tests/goldenFiles/DropUpperOfExe.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperOfLib.cabal b/tests/goldenFiles/DropUpperOfLib.cabal --- a/tests/goldenFiles/DropUpperOfLib.cabal +++ b/tests/goldenFiles/DropUpperOfLib.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base >=3, cmdargs >=0.10.5, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperOfOtherExe.cabal b/tests/goldenFiles/DropUpperOfOtherExe.cabal --- a/tests/goldenFiles/DropUpperOfOtherExe.cabal +++ b/tests/goldenFiles/DropUpperOfOtherExe.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperOfTest.cabal b/tests/goldenFiles/DropUpperOfTest.cabal --- a/tests/goldenFiles/DropUpperOfTest.cabal +++ b/tests/goldenFiles/DropUpperOfTest.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base >=3, cmdargs >=0.10.5, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <0.11, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/DropUpperOnlyBase.cabal b/tests/goldenFiles/DropUpperOnlyBase.cabal --- a/tests/goldenFiles/DropUpperOnlyBase.cabal +++ b/tests/goldenFiles/DropUpperOnlyBase.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base >=3, cmdargs >=0.10.5 && <0.11, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base >=3, cmdargs >=0.10.5 && <0.11, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base >=3, cmdargs >=0.10.5 && <0.11, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base >=3, cmdargs >=0.10.5 && <0.11, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=3, cmdargs >=0.10.5 && <0.11, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/FromFile.cabal b/tests/goldenFiles/FromFile.cabal --- a/tests/goldenFiles/FromFile.cabal +++ b/tests/goldenFiles/FromFile.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base >=3 && <5, cmdargs >=0.10.5 && <2.3, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal -any + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <2.3, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <2.3, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal -any + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <2.3, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=3 && <5, cmdargs >=0.10.5 && <2.3, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal -any + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds diff --git a/tests/goldenFiles/UpdateByHaskellPlatform.cabal b/tests/goldenFiles/UpdateByHaskellPlatform.cabal --- a/tests/goldenFiles/UpdateByHaskellPlatform.cabal +++ b/tests/goldenFiles/UpdateByHaskellPlatform.cabal @@ -15,11 +15,6 @@ location: https://github.com/dan-t/cabal-bounds library - exposed-modules: - CabalBounds.Args - CabalBounds.Command - CabalBounds.Execute - CabalBounds.Lenses build-depends: base >=4.6.0.1 && <4.7, cmdargs >=0.10.5 && <0.11, @@ -27,12 +22,16 @@ pretty-show -any, strict -any, Cabal >=1.16.0 && <1.17 + exposed-modules: + CabalBounds.Args + CabalBounds.Command + CabalBounds.Execute + CabalBounds.Lenses hs-source-dirs: src other-modules: Paths_cabal_bounds executable cabal-bounds - main-is: ExeMain1.hs build-depends: base >=4.6.0.1 && <4.7, cmdargs >=0.10.5 && <0.11, @@ -40,6 +39,7 @@ pretty-show -any, strict -any, Cabal >=1.16.0 && <1.17 + main-is: ExeMain1.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -51,7 +51,6 @@ ghc-options: -W executable other-exe - main-is: ExeMain2.hs build-depends: base >=4.6.0.1 && <4.7, cmdargs >=0.10.5 && <0.11, @@ -59,6 +58,7 @@ pretty-show -any, strict -any, Cabal >=1.16.0 && <1.17 + main-is: ExeMain2.hs cpp-options: -DCABAL hs-source-dirs: src other-modules: @@ -70,8 +70,6 @@ ghc-options: -W test-suite some-test - type: exitcode-stdio-1.0 - main-is: TestMain1.hs build-depends: base >=4.6.0.1 && <4.7, cmdargs >=0.10.5 && <0.11, @@ -79,6 +77,8 @@ pretty-show -any, strict -any, Cabal >=1.16.0 && <1.17 + type: exitcode-stdio-1.0 + main-is: TestMain1.hs hs-source-dirs: src other-modules: Paths_cabal_bounds @@ -88,8 +88,6 @@ CabalBounds.Lenses ghc-options: -W test-suite other-test - type: exitcode-stdio-1.0 - main-is: TestMain2.hs build-depends: base >=4.6.0.1 && <4.7, cmdargs >=0.10.5 && <0.11, @@ -97,6 +95,8 @@ pretty-show -any, strict -any, Cabal >=1.16.0 && <1.17 + type: exitcode-stdio-1.0 + main-is: TestMain2.hs hs-source-dirs: src other-modules: Paths_cabal_bounds