morte 1.6.16 → 1.6.17

raw patch · 4 files changed

+11/−11 lines, 4 filesdep +formattingdep −text-formatdep ~text

Dependencies added: formatting

Dependencies removed: text-format

Dependency ranges changed: text

Files

morte.cabal +8/−8
src/Morte/Core.hs +1/−1
src/Morte/Import.hs +1/−1
src/Morte/Parser.hs +1/−1

morte.cabal view

@@ -1,5 +1,5 @@ Name: morte-Version: 1.6.16+Version: 1.6.17 Cabal-Version: >=1.8.0.2 Build-Type: Simple Tested-With: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1@@ -48,7 +48,7 @@         system-filepath      >= 0.3.1    && < 0.5 ,         system-fileio        >= 0.2.1    && < 0.4 ,         text                 >= 0.11.1.0 && < 1.3 ,-        text-format                         < 0.4 ,+        formatting           >= 6.3      && < 6.4 ,         transformers         >= 0.2.0.0  && < 0.6     Exposed-Modules:         Morte.Context,@@ -63,12 +63,12 @@     Hs-Source-Dirs: exec     Main-Is: Main.hs     Build-Depends:-        base                 >= 4        && < 5    ,-        code-page            >= 0.1.1    && < 0.2  ,-        morte                                      ,-        optparse-applicative                < 0.15 ,-        text                 >= 0.11.1.0 && < 1.3  ,-        text-format                         < 0.4+        base                 >= 4     && < 5    ,+        code-page            >= 0.1.1 && < 0.2  ,+        formatting                              ,+        morte                                   ,+        optparse-applicative             < 0.15 ,+        text  Benchmark bench     Type: exitcode-stdio-1.0

src/Morte/Core.hs view

@@ -83,13 +83,13 @@ import Data.Foldable import Data.Monoid ((<>)) import Data.String (IsString(..))-import Data.Text.Buildable (Buildable(..)) import Data.Text.Lazy (Text) import Data.Text.Lazy.Builder (Builder) import Data.Traversable import Data.Typeable (Typeable) import Data.Word (Word8) import Filesystem.Path.CurrentOS (FilePath)+import Formatting.Buildable (Buildable(..)) import Morte.Context (Context) import Prelude hiding (FilePath)

src/Morte/Import.hs view

@@ -83,7 +83,6 @@ import Control.Monad.Trans.State.Strict (StateT) import Data.Map.Strict (Map) import Data.Monoid ((<>))-import Data.Text.Buildable (build) import Data.Text.Lazy (Text) import Data.Text.Lazy.Builder (Builder) #if MIN_VERSION_base(4,8,0)@@ -93,6 +92,7 @@ import Data.Typeable (Typeable) import Filesystem.Path ((</>), FilePath) import Filesystem as Filesystem+import Formatting.Buildable (build) import Lens.Micro (Lens') import Lens.Micro.Mtl (zoom) import Morte.Core (Expr, Path(..), X(..))

src/Morte/Parser.hs view

@@ -19,11 +19,11 @@ import Control.Monad.Trans.Except (Except, throwE, runExceptT) import Control.Monad.Trans.State.Strict (evalState, get) import Data.Monoid-import Data.Text.Buildable (Buildable(..)) import Data.Text.Lazy (Text) import Data.Text.Lazy.Builder (toLazyText) import Data.Typeable (Typeable) import Filesystem.Path.CurrentOS (FilePath)+import Formatting.Buildable (Buildable(..)) import Morte.Core (Var(..), Const(..), Path(..), Expr(..)) import Morte.Lexer (LocatedToken(..), Position(..), Token) import Prelude hiding (FilePath)