From fa1377b4ce1c28ef26b6e8242b03e615a0da63a3 Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Mon, 5 Aug 2024 00:12:56 -0600 Subject: [PATCH] Remove `-fpackage-trust` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s just too flaky. --- containers/yaya-containers.cabal | 21 ---------------- core/yaya.cabal | 29 ---------------------- hedgehog/yaya-hedgehog.cabal | 37 ---------------------------- quickcheck/yaya-quickcheck.cabal | 29 ---------------------- unsafe/yaya-unsafe.cabal | 41 -------------------------------- 5 files changed, 157 deletions(-) diff --git a/containers/yaya-containers.cabal b/containers/yaya-containers.cabal index 1080604..592a987 100644 --- a/containers/yaya-containers.cabal +++ b/containers/yaya-containers.cabal @@ -102,8 +102,6 @@ common defaults -- Warns even when `Unsafe` is explicit, not inferred. See -- https://gitlab.haskell.org/ghc/ghc/-/issues/16689 -Wno-unsafe - -fpackage-trust - -trust base if impl(ghc < 8.8.1) ghc-options: -- This used to warn even when `Safe` was explicit. @@ -114,8 +112,6 @@ common defaults -Wno-inferred-safe-imports -- We support GHC versions without qualified-post. -Wno-prepositive-qualified-module - -- `-trust` triggers this warning when applied to transitive dependencies. - -Wno-unused-packages if impl(ghc >= 9.2.1) ghc-options: -- We support GHC versions without kind signatures. @@ -163,23 +159,6 @@ library build-depends: containers ^>= {0.6.0, 0.7}, yaya ^>= {0.5.1, 0.6.0}, - ghc-options: - -trust adjunctions - -trust array - -trust base-orphans - -trust binary - -trust bytestring - -trust containers - -trust distributive - -trust exceptions - -trust foldable1-classes-compat - -trust ghc-prim - -trust hashable - -trust profunctors - -trust semigroupoids - -trust stm - -trust text - -trust transformers-compat exposed-modules: Yaya.Containers.Pattern.IntMap Yaya.Containers.Pattern.IntSet diff --git a/core/yaya.cabal b/core/yaya.cabal index 21b09a4..52c1e5a 100644 --- a/core/yaya.cabal +++ b/core/yaya.cabal @@ -108,8 +108,6 @@ common defaults -- Warns even when `Unsafe` is explicit, not inferred. See -- https://gitlab.haskell.org/ghc/ghc/-/issues/16689 -Wno-unsafe - -fpackage-trust - -trust base if impl(ghc < 8.8.1) ghc-options: -- This used to warn even when `Safe` was explicit. @@ -120,8 +118,6 @@ common defaults -Wno-inferred-safe-imports -- We support GHC versions without qualified-post. -Wno-prepositive-qualified-module - -- `-trust` triggers this warning when applied to transitive dependencies. - -Wno-unused-packages if impl(ghc >= 9.2.1) ghc-options: -- We support GHC versions without kind signatures. @@ -180,31 +176,6 @@ library -- th-abstraction < 0.3 has different field names th-abstraction ^>= {0.4.1, 0.5.0, 0.6.0, 0.7.0}, transformers ^>= {0.5.5, 0.6.1}, - -- NB: foldable-classes-compat is a transitive dependency … depending on - -- which version of other dependencies (specifically, - -- indexed-traversable) we select. However, `-trust` only works for - -- packages in the dependency graph, so we make it explicit here for the - -- times that it doesn’t get included transitively. - foldable1-classes-compat ^>= {0.1}, - ghc-options: - -trust adjunctions - -trust array - -trust base-orphans - -trust binary - -trust bytestring - -trust containers - -trust distributive - -trust exceptions - -trust foldable1-classes-compat - -trust ghc-prim - -trust hashable - -trust lens - -trust profunctors - -trust semigroupoids - -trust stm - -trust template-haskell - -trust text - -trust transformers-compat exposed-modules: Yaya.Applied Yaya.Experimental.Foldable diff --git a/hedgehog/yaya-hedgehog.cabal b/hedgehog/yaya-hedgehog.cabal index 53f2411..2643b3c 100644 --- a/hedgehog/yaya-hedgehog.cabal +++ b/hedgehog/yaya-hedgehog.cabal @@ -105,8 +105,6 @@ common defaults -- Warns even when `Unsafe` is explicit, not inferred. See -- https://gitlab.haskell.org/ghc/ghc/-/issues/16689 -Wno-unsafe - -fpackage-trust - -trust base if impl(ghc < 8.8.1) ghc-options: -- This used to warn even when `Safe` was explicit. @@ -117,8 +115,6 @@ common defaults -Wno-inferred-safe-imports -- We support GHC versions without qualified-post. -Wno-prepositive-qualified-module - -- `-trust` triggers this warning when applied to transitive dependencies. - -Wno-unused-packages if impl(ghc >= 9.2.1) ghc-options: -- We support GHC versions without kind signatures. @@ -168,23 +164,6 @@ library deriving-compat ^>= {0.5.9, 0.6}, hedgehog ^>= {1.0, 1.1, 1.2, 1.4}, yaya ^>= {0.5.1, 0.6.0}, - ghc-options: - -trust adjunctions - -trust array - -trust base-orphans - -trust binary - -trust bytestring - -trust containers - -trust distributive - -trust exceptions - -trust foldable1-classes-compat - -trust ghc-prim - -trust hashable - -trust profunctors - -trust semigroupoids - -trust stm - -trust text - -trust transformers-compat exposed-modules: Yaya.Hedgehog Yaya.Hedgehog.Expr @@ -242,20 +221,4 @@ test-suite yaya ghc-options: -rtsopts -threaded - -trust adjunctions - -trust array - -trust base-orphans - -trust binary - -trust bytestring - -trust containers - -trust distributive - -trust exceptions - -trust foldable1-classes-compat - -trust ghc-prim - -trust hashable - -trust profunctors - -trust semigroupoids - -trust stm - -trust text - -trust transformers-compat -with-rtsopts=-N diff --git a/quickcheck/yaya-quickcheck.cabal b/quickcheck/yaya-quickcheck.cabal index 6751a39..66d7184 100644 --- a/quickcheck/yaya-quickcheck.cabal +++ b/quickcheck/yaya-quickcheck.cabal @@ -105,8 +105,6 @@ common defaults -- Warns even when `Unsafe` is explicit, not inferred. See -- https://gitlab.haskell.org/ghc/ghc/-/issues/16689 -Wno-unsafe - -fpackage-trust - -trust base if impl(ghc < 8.8.1) ghc-options: -- This used to warn even when `Safe` was explicit. @@ -117,8 +115,6 @@ common defaults -Wno-inferred-safe-imports -- We support GHC versions without qualified-post. -Wno-prepositive-qualified-module - -- `-trust` triggers this warning when applied to transitive dependencies. - -Wno-unused-packages if impl(ghc >= 9.2.1) ghc-options: -- We support GHC versions without kind signatures. @@ -167,31 +163,6 @@ library build-depends: QuickCheck ^>= {2.10, 2.13.2, 2.14.2}, yaya ^>= {0.5.1, 0.6.0}, - -- NB: splitmix is a transitive dependency … if we select QuickCheck >= - -- 2.13. However, `-trust` only works for packages in the dependency - -- graph, so we make it explicit here for the times that it doesn’t get - -- included transitively. - splitmix ^>= {0.0.1, 0.1.0}, - ghc-options: - -trust QuickCheck - -trust adjunctions - -trust array - -trust base-orphans - -trust binary - -trust bytestring - -trust containers - -trust distributive - -trust exceptions - -trust foldable1-classes-compat - -trust ghc-prim - -trust hashable - -trust profunctors - -trust random - -trust semigroupoids - -trust splitmix - -trust stm - -trust text - -trust transformers-compat exposed-modules: Yaya.QuickCheck.Fold diff --git a/unsafe/yaya-unsafe.cabal b/unsafe/yaya-unsafe.cabal index 2811a64..edd63a4 100644 --- a/unsafe/yaya-unsafe.cabal +++ b/unsafe/yaya-unsafe.cabal @@ -110,8 +110,6 @@ common defaults -- Warns even when `Unsafe` is explicit, not inferred. See -- https://gitlab.haskell.org/ghc/ghc/-/issues/16689 -Wno-unsafe - -fpackage-trust - -trust base if impl(ghc < 8.8.1) ghc-options: -- This used to warn even when `Safe` was explicit. @@ -122,8 +120,6 @@ common defaults -Wno-inferred-safe-imports -- We support GHC versions without qualified-post. -Wno-prepositive-qualified-module - -- `-trust` triggers this warning when applied to transitive dependencies. - -Wno-unused-packages if impl(ghc >= 9.2.1) ghc-options: -- We support GHC versions without kind signatures. @@ -170,30 +166,11 @@ library hs-source-dirs: src build-depends: - bifunctors ^>= {5.5.7, 5.6}, comonad ^>= 5.0.7, free ^>= {5.1.5, 5.2}, -- `Control.Lens` in lens < 5 is `Unsafe` lens ^>= {5, 5.1, 5.2, 5.3}, yaya ^>= {0.5.1, 0.6.0}, - ghc-options: - -trust adjunctions - -trust array - -trust base-orphans - -trust binary - -trust bytestring - -trust containers - -trust distributive - -trust exceptions - -trust foldable1-classes-compat - -trust ghc-prim - -trust hashable - -trust lens - -trust profunctors - -trust semigroupoids - -trust stm - -trust text - -trust transformers-compat exposed-modules: Yaya.Unsafe.Applied Yaya.Unsafe.Fold @@ -250,22 +227,4 @@ test-suite yaya-unsafe -fno-omit-yields -rtsopts -threaded - -trust adjunctions - -trust array - -trust base-orphans - -trust binary - -trust bytestring - -trust containers - -trust distributive - -trust exceptions - -trust foldable1-classes-compat - -trust ghc-prim - -trust hashable - -trust lens - -trust profunctors - -trust semigroupoids - -trust stm - -trust template-haskell - -trust text - -trust transformers-compat -with-rtsopts=-N