From 4dc2000f97236089a8613cc6b0bf9846fea6abfa Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 15 May 2017 23:32:17 -0400 Subject: adeiu, MissingH Removed dependency on MissingH, instead depending on the split library. After laying groundwork for this since 2015, it was mostly straightforward. Added Utility.Tuple and Utility.Split. Eyeballed System.Path.WildMatch while implementing the same thing. Since MissingH's progress meter display was being used, I re-implemented my own. Bonus: Now progress is displayed for transfers of files of unknown size. This commit was sponsored by Shane-o on Patreon. --- Build/EvilLinker.hs | 2 +- Build/EvilSplicer.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Build') diff --git a/Build/EvilLinker.hs b/Build/EvilLinker.hs index 47111d476..8d3afa9cd 100644 --- a/Build/EvilLinker.hs +++ b/Build/EvilLinker.hs @@ -10,7 +10,6 @@ module Main where -import Data.List.Utils import Text.Parsec import Text.Parsec.String import Control.Applicative ((<$>)) @@ -23,6 +22,7 @@ import Utility.Process hiding (env) import qualified Utility.Process import Utility.Env import Utility.Directory +import Utility.Split data CmdParams = CmdParams { cmd :: String diff --git a/Build/EvilSplicer.hs b/Build/EvilSplicer.hs index 4e7b1c9bf..e07034c5b 100644 --- a/Build/EvilSplicer.hs +++ b/Build/EvilSplicer.hs @@ -35,7 +35,6 @@ import Text.Parsec.String import Control.Applicative ((<$>)) import Data.Either import Data.List hiding (find) -import Data.String.Utils import Data.Char import System.Environment import System.FilePath @@ -49,6 +48,7 @@ import Utility.Exception hiding (try) import Utility.Path import Utility.FileSystemEncoding import Utility.Directory +import Utility.Split data Coord = Coord { coordLine :: Int -- cgit v1.2.3