Merge pull request #188 from aelve/new-fmt-version

Use fmt-0.4.0 with renewed operators +| |+

.gitignore

@@ -33,3 +33,4 @@ tags
 
 # JavaScript
 guidejs/node_modules/
+static/js/

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.*

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           Fmt                    as X
-                                              (|##||), (||#), (||##|), (||##||))
-import qualified Fmt                    as FMT (( #| ), ( #|| ), (|#), (|##|), (|##||),
-                                                (||#), (||##|), (||##||))
-import           Fmt.Internal           (FromBuilder)
 
 
 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.||##|)

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