diff --git a/.gitignore b/.gitignore index e268c2d..ef9c384 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ tags # JavaScript guidejs/node_modules/ +static/js/ diff --git a/guide.cabal b/guide.cabal index 02cd2b2..0ee176a 100644 --- a/guide.cabal +++ b/guide.cabal @@ -103,7 +103,7 @@ library , feed >= 0.3.11 && < 0.4 , filemanip == 0.3.6.* , filepath - , fmt == 0.2.* + , fmt == 0.4.* , focus , friendly-time == 0.4.* , fsnotify == 0.2.* diff --git a/src/Imports.hs b/src/Imports.hs index 67992d7..d9c66fc 100644 --- a/src/Imports.hs +++ b/src/Imports.hs @@ -8,15 +8,7 @@ the "Prelude".) module Imports ( module X, - LByteString, - (+|), - (|+), - (+||), - (||+), - (|++|), - (||++||), - (|++||), - (||++|) + LByteString ) where @@ -48,44 +40,8 @@ import Data.Hashable as X -- Lazy bytestring import qualified Data.ByteString.Lazy as BSL -- Formatting -import Fmt as X hiding (( #| ), ( #|| ), (|#), (|##|), - (|##||), (||#), (||##|), (||##||)) -import qualified Fmt as FMT (( #| ), ( #|| ), (|#), (|##|), (|##||), - (||#), (||##|), (||##||)) -import Fmt.Internal (FromBuilder) +import Fmt as X type LByteString = BSL.ByteString -- LText is already provided by Data.Text.All - -infixr 1 +| -(+|) :: FromBuilder b => Builder -> Builder -> b -(+|) = (FMT.#|) - -infixr 1 |+ -(|+) :: (Buildable a, FromBuilder b) => a -> Builder -> b -(|+) = (FMT.|#) - -infixr 1 +|| -(+||) :: FromBuilder b => Builder -> Builder -> b -(+||) = (FMT.#||) - -infixr 1 ||+ -(||+) :: (Show a, FromBuilder b) => a -> Builder -> b -(||+) = (FMT.||#) - -infixr 1 |++| -(|++|) :: (Buildable a, FromBuilder b) => a -> Builder -> b -(|++|) = (FMT.|##|) - -infixr 1 ||++|| -(||++||) :: (Show a, FromBuilder b) => a -> Builder -> b -(||++||) = (FMT.||##||) - -infixr 1 ||++| -(|++||) :: (Show a, FromBuilder b) => a -> Builder -> b -(|++||) = (FMT.|##||) - -infixr 1 |++|| -(||++|) :: (Buildable a, FromBuilder b) => a -> Builder -> b -(||++|) = (FMT.||##|) diff --git a/stack.yaml b/stack.yaml index 6d5f8d1..d942061 100644 --- a/stack.yaml +++ b/stack.yaml @@ -15,6 +15,6 @@ extra-deps: - text-all-0.4.1.0 - cmark-sections-0.1.0.3 - patches-vector-0.1.5.4 -- fmt-0.2.0.0 +- fmt-0.4.0.0 - Spock-digestive-0.3.0.0 - digestive-functors-0.8.2.0