Try allowing RawImage stuff on Windows

codedownio · Nov 18, 2023 · 815f553 · 815f553
1 parent f11b81a
commit 815f553
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/sandwich-slack/src/Test/Sandwich/Formatters/Slack/Internal/Markdown.hs b/sandwich-slack/src/Test/Sandwich/Formatters/Slack/Internal/Markdown.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 
 module Test.Sandwich.Formatters.Slack.Internal.Markdown where
 
@@ -13,9 +12,7 @@ import Test.Sandwich.Formatters.Slack.Internal.Types
 
 toMarkdown :: FailureReason -> T.Text
 toMarkdown (Reason {..}) = T.pack failureReason
-#ifndef mingw32_HOST_OS
 toMarkdown (RawImage {..}) = T.pack failureFallback
-#endif
 toMarkdown (ChildrenFailed {failureNumChildren=n}) = [i|#{n} #{if n == 1 then ("child" :: T.Text) else "children"} failed|]
 toMarkdown (ExpectedButGot {..}) = [i|Expected *#{failureValue1}* but got *#{failureValue2}*|]
 toMarkdown (DidNotExpectButGot {..}) = [i|Did not expect *#{failureValue1}*|]

diff --git a/sandwich/src/Test/Sandwich/Formatters/Print/FailureReason.hs b/sandwich/src/Test/Sandwich/Formatters/Print/FailureReason.hs
@@ -2,7 +2,6 @@
 
 -- | Pretty printing failure reasons
 
-
 module Test.Sandwich.Formatters.Print.FailureReason (
   printFailureReason
   ) where
@@ -28,10 +27,8 @@ import Control.Monad
 printFailureReason :: FailureReason -> ReaderT (PrintFormatter, Int, Handle) IO ()
 printFailureReason (Reason _ s) = do
   printShowBoxPrettyWithTitleString "Reason: " s
-#ifndef mingw32_HOST_OS
 printFailureReason (RawImage _ fallback _image) = do
   forM_ (L.lines fallback) pin
-#endif
 printFailureReason (ChildrenFailed _ n) = do
   picn midWhite ([i|#{n} #{if n == 1 then ("child" :: String) else "children"} failed|] :: String)
 printFailureReason (ExpectedButGot _ seb1 seb2) = do

diff --git a/sandwich/src/Test/Sandwich/Types/Spec.hs b/sandwich/src/Test/Sandwich/Types/Spec.hs
@@ -32,11 +32,8 @@ import Data.Maybe
 import Data.String.Interpolate
 import GHC.Stack
 import GHC.TypeLits
-import Safe
-
-#ifndef mingw32_HOST_OS
 import Graphics.Vty.Image (Image)
-#endif
+import Safe
 
 #if !MIN_VERSION_base(4,13,0)
 import Control.Monad.Fail
@@ -105,12 +102,9 @@ data FailureReason = Reason { failureCallStack :: Maybe CallStack
                                        , failureAsyncException :: SomeAsyncExceptionWithEq }
                    | ChildrenFailed { failureCallStack :: Maybe CallStack
                                     , failureNumChildren :: Int }
-#ifndef mingw32_HOST_OS
                    | RawImage { failureCallStack :: Maybe CallStack
                               , failureFallback :: String
                               , failureRawImage :: Image }
-#endif
-
   deriving (Show, Typeable, Eq)
 
 instance Exception FailureReason