From a4c9c7f5c2697035b937bb6e6b9195e4091358a2 Mon Sep 17 00:00:00 2001 From: mbays Date: Sun, 25 Jun 2023 00:00:00 +0000 Subject: [PATCH] trim imports --- ClientState.hs | 1 - LineClient.hs | 39 ++++++++++++++-------------------- diohsc.hs | 67 ++++++++++------------------------------------------------ 3 files changed, 27 insertions(+), 80 deletions(-) diff --git a/ClientState.hs b/ClientState.hs index 6833510..4bce28c 100644 --- a/ClientState.hs +++ b/ClientState.hs @@ -69,4 +69,3 @@ modifyCConf f = modify $ \s -> s { clientConfig = f $ clientConfig s } modifyQueues :: (QueueMap -> QueueMap) -> ClientM () modifyQueues f = modify $ \s -> s { clientQueues = f $ clientQueues s } - diff --git a/LineClient.hs b/LineClient.hs index e9aff22..5266cd3 100644 --- a/LineClient.hs +++ b/LineClient.hs @@ -16,40 +16,39 @@ module LineClient (lineClient) where +import qualified Codec.MIME.Parse as MIME +import qualified Codec.MIME.Type as MIME import Control.Applicative (Alternative, empty) import Control.Monad.Catch import Control.Monad.State import Control.Monad.Trans.Maybe (MaybeT (..), runMaybeT) + import Data.Bifunctor (second) -import Data.Char (isAlpha, toLower) +import qualified Data.ByteString.Lazy as BL +import Data.Char (toLower) import Data.Hash (hash) import Data.IORef (modifyIORef, newIORef, readIORef) import Data.List (intercalate, isPrefixOf, isSuffixOf, sort, stripPrefix) -import Data.Maybe -import Safe -import System.Directory -import System.Environment -import System.Exit -import System.FilePath -import System.IO -import System.IO.Unsafe (unsafeInterleaveIO) -import Text.Regex (matchRegex, mkRegexWithOpts) -import Time.System (timeCurrentP) - -import qualified Data.ByteString.Lazy as BL - -import qualified Codec.MIME.Parse as MIME -import qualified Codec.MIME.Type as MIME import qualified Data.Map as M +import Data.Maybe import qualified Data.Set as S import qualified Data.Text as TS import qualified Data.Text.Encoding.Error as T import qualified Data.Text.Lazy as T import qualified Data.Text.Lazy.Encoding as T import qualified Data.Text.Lazy.IO as T + +import Safe import qualified System.Console.Haskeline as HL import qualified System.Console.Terminal.Size as Size +import System.Directory +import System.Environment +import System.FilePath +import System.IO.Unsafe (unsafeInterleaveIO) + +import Text.Regex (matchRegex, mkRegexWithOpts) +import Time.System (timeCurrentP) import ActiveIdentities import Alias @@ -66,7 +65,6 @@ import Identity import Marks import MetaString import Mundanities -import Opts import Pager import PrintFancy import Prompt hiding (promptYN) @@ -81,11 +79,6 @@ import Target import TextGemini import URI import Util -import Version - -#ifndef WINDOWS -import System.Posix.Files (ownerModes, setFileMode) -#endif #ifdef ICONV import Codec.Text.IConv (convert) @@ -536,7 +529,7 @@ handleCommandLine Nothing -> printErr "No current location. Enter an URI, or type \"help\"." handleCommand ts ("add", args) = case parseQueueSpec $ commandArgArg <$> args of - Nothing -> printErr "Bad arguments to 'add'." + Nothing -> printErr "Bad arguments to 'add'." Just qs -> modifyQueues . enqueue qs $ targetQueueItem <$> ts handleCommand ts ("fetch", args) = case parseQueueSpec $ commandArgArg <$> args of diff --git a/diohsc.hs b/diohsc.hs index e5db51e..3d97ea6 100644 --- a/diohsc.hs +++ b/diohsc.hs @@ -15,84 +15,39 @@ module Main where -import Control.Applicative (Alternative, empty) import Control.Monad.Catch import Control.Monad.State -import Control.Monad.Trans.Maybe (MaybeT (..), runMaybeT) -import Data.Bifunctor (second) -import Data.Char (isAlpha, toLower) -import Data.Hash (hash) -import Data.IORef (modifyIORef, newIORef, readIORef) -import Data.List (intercalate, isPrefixOf, - isSuffixOf, sort, stripPrefix) + +import Data.Hash (hash) import Data.Maybe -import Safe +import qualified Data.Set as S +import qualified Data.Text.Lazy as T +import qualified Data.Text.Lazy.IO as T + +import qualified System.Console.Haskeline as HL import System.Directory import System.Environment import System.Exit import System.FilePath import System.IO -import System.IO.Unsafe (unsafeInterleaveIO) -import Text.Regex (matchRegex, mkRegexWithOpts) -import Time.System (timeCurrentP) - -import qualified Data.ByteString.Lazy as BL - -import qualified Codec.MIME.Parse as MIME -import qualified Codec.MIME.Type as MIME -import qualified Data.Map as M -import qualified Data.Set as S -import qualified Data.Text as TS -import qualified Data.Text.Encoding.Error as T -import qualified Data.Text.Lazy as T -import qualified Data.Text.Lazy.Encoding as T -import qualified Data.Text.Lazy.IO as T -import qualified System.Console.Haskeline as HL -import qualified System.Console.Terminal.Size as Size - -import ActiveIdentities -import Alias -import ANSIColour + + import qualified BStack -import ClientCert (KeyType (..)) import ClientOptions import ClientState -import Command -import CommandLine import GeminiProtocol -import History -import Identity import LineClient import Marks -import MetaString import Mundanities import Opts -import Pager import PrintFancy -import Prompt hiding (promptYN) +import Prompt hiding (promptYN) import qualified Prompt -import Queue -import Request -import ResolveTarget -import qualified RunExternal -import RunExternal hiding (runRestrictedIO) -import Slurp -import Target -import TextGemini import URI -import Util import Version #ifndef WINDOWS -import System.Posix.Files (ownerModes, setFileMode) -#endif - -#ifdef ICONV -import Codec.Text.IConv (convert) -#endif - -#ifdef MAGIC -import qualified Magic +import System.Posix.Files (ownerModes, setFileMode) #endif main :: IO () -- 2.11.4.GIT