From 178d3f8c2f93ae4813908c04d50b215aa8d6f269 Mon Sep 17 00:00:00 2001 From: Anton Sorokin Date: Tue, 11 Oct 2022 16:59:52 +0300 Subject: [PATCH] fixup! fixup! fixup! fixup! fixup! [#164] Add workflow for running Windows tests on CI --- package.yaml | 2 +- src/Xrefcheck/Scan.hs | 5 +++-- src/Xrefcheck/System.hs | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package.yaml b/package.yaml index cc692b3f..10fdec42 100644 --- a/package.yaml +++ b/package.yaml @@ -112,7 +112,7 @@ library: - yaml - reflection - code-page - + executables: xrefcheck: main: Main.hs diff --git a/src/Xrefcheck/Scan.hs b/src/Xrefcheck/Scan.hs index d1980d8e..f642113a 100644 --- a/src/Xrefcheck/Scan.hs +++ b/src/Xrefcheck/Scan.hs @@ -29,8 +29,9 @@ import Data.Reflection (Given) import Fmt (Buildable (..), nameF, (+|), (|+)) import System.Directory (doesDirectoryExist) import System.Directory.Tree qualified as Tree -import qualified System.FilePath as OsDependentFilePath -import System.FilePath.Posix (dropTrailingPathSeparator, equalFilePath, takeDirectory, takeExtension) +import System.FilePath qualified as OsDependentFilePath +import System.FilePath.Posix + (dropTrailingPathSeparator, equalFilePath, takeDirectory, takeExtension) import Xrefcheck.Core import Xrefcheck.Progress diff --git a/src/Xrefcheck/System.hs b/src/Xrefcheck/System.hs index 05c7d43b..213a50df 100644 --- a/src/Xrefcheck/System.hs +++ b/src/Xrefcheck/System.hs @@ -20,8 +20,9 @@ import Data.Coerce (coerce) import GHC.IO.Unsafe (unsafePerformIO) import System.Directory (canonicalizePath) import System.Environment (lookupEnv) -import System.FilePath.Posix (()) import System.FilePath.Glob qualified as Glob +import System.FilePath.Posix (()) + import Xrefcheck.Util (normaliseWithNoTrailing) -- | We can quite safely treat surrounding filesystem as frozen,