From 1c96abe2d12f5f0e1fa66c6aa58900790e06f6a6 Mon Sep 17 00:00:00 2001 From: Stephen Morgan Date: Mon, 27 Sep 2021 16:49:45 +1000 Subject: [PATCH] Remove dependency on data-default-instances-base Since data-default-class-1.2.0 (released in 2016), data-default-instances-base just re-exports instances from data-default-class, and so is redundant. --- src/Text/Layout/Table.hs | 1 - src/Text/Layout/Table/Spec/HeaderColSpec.hs | 3 +-- table-layout.cabal | 9 +++------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Text/Layout/Table.hs b/src/Text/Layout/Table.hs index 4862bc2..c5bc9da 100644 --- a/src/Text/Layout/Table.hs +++ b/src/Text/Layout/Table.hs @@ -118,7 +118,6 @@ module Text.Layout.Table import Data.List import Data.Default.Class -import Data.Default.Instances.Base () import Text.Layout.Table.Cell import Text.Layout.Table.Justify diff --git a/src/Text/Layout/Table/Spec/HeaderColSpec.hs b/src/Text/Layout/Table/Spec/HeaderColSpec.hs index de13e96..3ab4c39 100644 --- a/src/Text/Layout/Table/Spec/HeaderColSpec.hs +++ b/src/Text/Layout/Table/Spec/HeaderColSpec.hs @@ -1,7 +1,6 @@ module Text.Layout.Table.Spec.HeaderColSpec where import Data.Default.Class -import Data.Default.Instances.Base () import Text.Layout.Table.Spec.Position import Text.Layout.Table.Spec.CutMark @@ -17,4 +16,4 @@ headerColumn = HeaderColSpec -- | Header columns are usually centered. instance Default HeaderColSpec where - def = headerColumn center def + def = headerColumn center Nothing diff --git a/table-layout.cabal b/table-layout.cabal index f42f722..3ea1c8d 100644 --- a/table-layout.cabal +++ b/table-layout.cabal @@ -90,8 +90,7 @@ library -- Other library packages from which modules are imported. build-depends: base >=4.9 && <4.15, - data-default-class >=0.1.1 && < 0.2, - data-default-instances-base ==0.1.* + data-default-class >=0.1.2 && < 0.2 hs-source-dirs: src @@ -101,8 +100,7 @@ library executable table-layout-test-styles main-is: Test.hs build-depends: base >=4.9 && <4.15, - data-default-class >=0.1.1 && < 0.2, - data-default-instances-base ==0.1.* + data-default-class >=0.1.2 && < 0.2 hs-source-dirs: src other-modules: Text.Layout.Table, Text.Layout.Table.Cell, @@ -138,8 +136,7 @@ test-suite table-layout-tests build-depends: base >=4.9 && <4.15, QuickCheck >=2.8 && < 2.15, HUnit >=1.3, - data-default-class >=0.1.1 && < 0.2, - data-default-instances-base ==0.1.*, + data-default-class >=0.1.2 && < 0.2, hspec other-modules: TestSpec,