diff --git a/.hlint.yaml b/.hlint.yaml --- a/.hlint.yaml +++ b/.hlint.yaml @@ -908,6 +908,9 @@ - as: L importStyle: explicitOrQualified name: Data.List + - as: L + importStyle: explicitOrQualified + name: Data.Containers.ListUtils - as: NE importStyle: explicitOrQualified name: Data.List.NonEmpty diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,24 @@ ## [Unreleased] +## [1.1.6.0] - 2026-06-16 + +### Added + +- hlint rule to import `Data.Containers.ListUtils` qualified as `L`, + matching the alias used for `Data.List` + +### Changed + +- Relax the lower bound of the `uuid` dependency from `>=1.3.16.1` to `>=1.3.11`, + the first version that provides all of the re-exported and hidden names + +### Removed + +- Stop distributing `.hlint.yaml` and `fourmolu.yaml` as Cabal `data-files`, + since downstream usage cannot be verified. + `.hlint.yaml` is kept under `extra-source-files` only because the test suite needs it + ## [1.1.5.0] - 2026-06-14 ### Added diff --git a/fourmolu.yaml b/fourmolu.yaml deleted file mode 100644 --- a/fourmolu.yaml +++ /dev/null @@ -1,181 +0,0 @@ -indentation: 2 -column-limit: 100 -function-arrows: leading -import-export-style: leading -haddock-style: single-line -sort-constraints: true -sort-derived-classes: true - -# Himariがre-exportしているモジュールの演算子fixity解決用 -# チェーン方式: fourmoluは再帰的にreexportsを展開する -reexports: - # Himari → 内部モジュール - - module Himari exports "himari" Himari.Char - - module Himari exports "himari" Himari.Env - - module Himari exports "himari" Himari.Env.Simple - - module Himari exports "himari" Himari.Logger - - module Himari exports "himari" Himari.Prelude - - # Himari.Prelude → 外部モジュール - - module Himari.Prelude exports "base" Data.Coerce - - module Himari.Prelude exports "pretty-simple" Debug.Pretty.Simple - - module Himari.Prelude exports "primitive" Control.Monad.Primitive - - module Himari.Prelude exports "retry" UnliftIO.Retry - - module Himari.Prelude exports "unliftio" UnliftIO - - module Himari.Prelude exports "unliftio" UnliftIO.Concurrent - - module Himari.Prelude exports "unliftio" UnliftIO.Directory - - module Himari.Prelude exports "unliftio" UnliftIO.Exception.Lens - - module Himari.Prelude exports "unliftio" UnliftIO.IO.File - # Himari.Prelude → 内部サブモジュール - - module Himari.Prelude exports "himari" Himari.Prelude.Aeson - - module Himari.Prelude exports "himari" Himari.Prelude.Casing - - module Himari.Prelude exports "himari" Himari.Prelude.Here - - module Himari.Prelude exports "himari" Himari.Prelude.Process - - module Himari.Prelude exports "himari" Himari.Prelude.TypeLevel - - module Himari.Prelude exports "himari" Himari.Prelude.UUID - - module Himari.Prelude exports "himari" Himari.SafePrelude - - # Himari.SafePrelude → 外部モジュール - - module Himari.SafePrelude exports "base" Control.Applicative - - module Himari.SafePrelude exports "base" Control.Monad - - module Himari.SafePrelude exports "base" Control.Monad.ST - - module Himari.SafePrelude exports "base" Data.Bifoldable - - module Himari.SafePrelude exports "base" Data.Bitraversable - - module Himari.SafePrelude exports "base" Data.Bool - - module Himari.SafePrelude exports "base" Data.Complex - - module Himari.SafePrelude exports "base" Data.Either - - module Himari.SafePrelude exports "base" Data.Eq - - module Himari.SafePrelude exports "base" Data.Fixed - - module Himari.SafePrelude exports "base" Data.Foldable - - module Himari.SafePrelude exports "base" Data.Function - - module Himari.SafePrelude exports "base" Data.Functor.Compose - - module Himari.SafePrelude exports "base" Data.Int - - module Himari.SafePrelude exports "base" Data.Kind - - module Himari.SafePrelude exports "base" Data.Maybe - - module Himari.SafePrelude exports "base" Data.Ord - - module Himari.SafePrelude exports "base" Data.Proxy - - module Himari.SafePrelude exports "base" Data.Ratio - - module Himari.SafePrelude exports "base" Data.String - - module Himari.SafePrelude exports "base" Data.Traversable - - module Himari.SafePrelude exports "base" Data.Tuple - - module Himari.SafePrelude exports "base" Data.Void - - module Himari.SafePrelude exports "base" Data.Word - - module Himari.SafePrelude exports "base" GHC.Stack - - module Himari.SafePrelude exports "base" Numeric - - module Himari.SafePrelude exports "base" Numeric.Natural - - module Himari.SafePrelude exports "base" Prelude - - module Himari.SafePrelude exports "base" Text.Show - - module Himari.SafePrelude exports "convertible" Data.Convertible - - module Himari.SafePrelude exports "data-default" Data.Default - - module Himari.SafePrelude exports "deepseq" Control.DeepSeq - - module Himari.SafePrelude exports "hashable" Data.Hashable - - module Himari.SafePrelude exports "lens" Control.Lens - - module Himari.SafePrelude exports "monad-logger" Control.Monad.Logger - - module Himari.SafePrelude exports "mtl" Control.Monad.Cont - - module Himari.SafePrelude exports "mtl" Control.Monad.Reader - - module Himari.SafePrelude exports "mtl" Control.Monad.State.Strict - - module Himari.SafePrelude exports "mtl" Control.Monad.Writer.CPS - - module Himari.SafePrelude exports "pretty-simple" Text.Pretty.Simple - - module Himari.SafePrelude exports "time" Data.Time - - module Himari.SafePrelude exports "time" Data.Time.Calendar.Easter - - module Himari.SafePrelude exports "time" Data.Time.Calendar.Julian - - module Himari.SafePrelude exports "time" Data.Time.Calendar.Month - - module Himari.SafePrelude exports "time" Data.Time.Calendar.MonthDay - - module Himari.SafePrelude exports "time" Data.Time.Calendar.OrdinalDate - - module Himari.SafePrelude exports "time" Data.Time.Calendar.Quarter - - module Himari.SafePrelude exports "time" Data.Time.Calendar.WeekDate - - module Himari.SafePrelude exports "time" Data.Time.Clock.POSIX - - module Himari.SafePrelude exports "time" Data.Time.Clock.System - - module Himari.SafePrelude exports "time" Data.Time.Clock.TAI - - module Himari.SafePrelude exports "time" Data.Time.Format.ISO8601 - - module Himari.SafePrelude exports "unliftio" UnliftIO.Environment - # Himari.SafePrelude → 内部サブモジュール - - module Himari.SafePrelude exports "himari" Himari.Prelude.Arrow - - module Himari.SafePrelude exports "himari" Himari.Prelude.Catch - - module Himari.SafePrelude exports "himari" Himari.Prelude.Category - - module Himari.SafePrelude exports "himari" Himari.Prelude.Data - - module Himari.SafePrelude exports "himari" Himari.Prelude.FilePath - - module Himari.SafePrelude exports "himari" Himari.Prelude.Generics - - module Himari.SafePrelude exports "himari" Himari.Prelude.Monoid - - module Himari.SafePrelude exports "himari" Himari.Prelude.Safe - - module Himari.SafePrelude exports "himari" Himari.Prelude.Type - - # Himari.Prelude.Aeson → 外部モジュール - - module Himari.Prelude.Aeson exports "aeson" Data.Aeson - - module Himari.Prelude.Aeson exports "aeson" Data.Aeson.QQ.Simple - - module Himari.Prelude.Aeson exports "aeson-pretty" Data.Aeson.Encode.Pretty - - module Himari.Prelude.Aeson exports "deriving-aeson" Deriving.Aeson - - # Himari.Prelude.Casing → 外部モジュール - - module Himari.Prelude.Casing exports "casing" Text.Casing - - # Himari.Prelude.Here → 外部モジュール - - module Himari.Prelude.Here exports "here" Data.String.Here - - # Himari.Prelude.Category → 外部モジュール - - module Himari.Prelude.Category exports "base" Control.Category - - # Himari.Prelude.FilePath → 外部モジュール - - module Himari.Prelude.FilePath exports "filepath" System.FilePath - - # Himari.Prelude.Generics → 外部モジュール - - module Himari.Prelude.Generics exports "base" GHC.Generics - - # Himari.Prelude.Safe → 外部モジュール - - module Himari.Prelude.Safe exports "safe" Safe - - module Himari.Prelude.Safe exports "safe" Safe.Exact - - module Himari.Prelude.Safe exports "safe" Safe.Foldable - - # Himari.Prelude.Arrow → 外部モジュール - - module Himari.Prelude.Arrow exports "base" Control.Arrow - - # Himari.Prelude.Catch → 外部モジュール - - module Himari.Prelude.Catch exports "exceptions" Control.Monad.Catch - - # Himari.Prelude.Data → 外部モジュール - - module Himari.Prelude.Data exports "base" Data.Data - - # Himari.Prelude.Monoid → 外部モジュール - - module Himari.Prelude.Monoid exports "base" Data.Monoid - - module Himari.Prelude.Monoid exports "base" Data.Semigroup - - # Himari.Prelude.Process → 外部モジュール - - module Himari.Prelude.Process exports "typed-process" System.Process.Typed - - # Himari.Prelude.Type → 外部モジュール - - module Himari.Prelude.Type exports "bytestring" Data.ByteString - - module Himari.Prelude.Type exports "bytestring" Data.ByteString.Lazy - - module Himari.Prelude.Type exports "bytestring" Data.ByteString.Short - - module Himari.Prelude.Type exports "unordered-containers" Data.HashMap.Strict - - module Himari.Prelude.Type exports "unordered-containers" Data.HashSet - - module Himari.Prelude.Type exports "containers" Data.IntMap.Strict - - module Himari.Prelude.Type exports "containers" Data.IntSet - - module Himari.Prelude.Type exports "base" Data.List - - module Himari.Prelude.Type exports "base" Data.List.NonEmpty - - module Himari.Prelude.Type exports "containers" Data.Map.Strict - - module Himari.Prelude.Type exports "containers" Data.Sequence - - module Himari.Prelude.Type exports "containers" Data.Set - - module Himari.Prelude.Type exports "text" Data.Text - - module Himari.Prelude.Type exports "text" Data.Text.Lazy - - module Himari.Prelude.Type exports "containers" Data.Tree - - module Himari.Prelude.Type exports "vector" Data.Vector - - # Himari.Prelude.TypeLevel → 外部モジュール - - module Himari.Prelude.TypeLevel exports "base" Data.Type.Coercion - - module Himari.Prelude.TypeLevel exports "base" Data.Type.Equality - - # Himari.Prelude.UUID → 外部モジュール - - module Himari.Prelude.UUID exports "uuid" Data.UUID - - module Himari.Prelude.UUID exports "uuid" Data.UUID.V4 - -# 利用者向けの汎用的なfixity設定 -# hspecは既にfourmoluによってサポートされているため不要 -# sydtestは既にinfix宣言があるため不要 -# sandwichはinfix宣言がないため手動設定が必要 -# hspec, sydtest, sandwichと名前が被っている演算子が多いが優先度は概ね同じなので使いまわします -fixities: - - infix 1 `shouldBe`, `shouldNotBe`, `shouldContain`, `shouldNotContain` - - infix 1 `shouldBeSet`, `shouldContainPredicate`, `shouldNotContainPredicate` - - infix 1 `shouldBeNothing`, `shouldBeJust`, `shouldBeLeft`, `shouldBeRight` - - infix 1 `textShouldContain`, `textShouldNotContain` - - infix 1 `shouldFail`, `shouldFailPredicate`, `shouldThrow` diff --git a/himari.cabal b/himari.cabal --- a/himari.cabal +++ b/himari.cabal @@ -1,6 +1,6 @@ cabal-version: 3.12 name: himari -version: 1.1.5.0 +version: 1.1.6.0 synopsis: A standard library for Haskell as an alternative to rio description: A standard library for Haskell inspired by rio. @@ -18,9 +18,12 @@ copyright: ncaq category: Control build-type: Simple -data-files: +-- テスト(`HlintBaseSpec`など)が`hlint`を実行する際に、 +-- プロジェクトルートの`.hlint.yaml`を読み込むため必要。 +-- `data-files`としての利用者向け配布はやめたが、 +-- テスト実行には必要。 +extra-source-files: .hlint.yaml - fourmolu.yaml extra-doc-files: CHANGELOG.md @@ -106,7 +109,7 @@ typed-process >=0.2.13.0 && <0.3, unliftio >=0.2.25.1 && <0.3, unordered-containers >=0.2.20 && <0.3, - uuid >=1.3.16.1 && <1.4, + uuid >=1.3.11 && <1.4, vector >=0.13.2.0 && <0.14, library