Revert "Use fromRight instead of reimplementing it"

We still support GHC 8.0, which didn't have fromRight.

This reverts commit 64c31d9142.
This commit is contained in:
Joseph C. Sible 2020-04-24 22:14:08 -04:00
parent 75863a887e
commit e0daa936d2
3 changed files with 3 additions and 6 deletions

View File

@ -22,7 +22,6 @@ module ShellCheck.Formatter.GCC (format) where
import ShellCheck.Interface
import ShellCheck.Formatter.Format
import Data.Either
import Data.List
import GHC.Exts
import System.IO
@ -45,7 +44,7 @@ outputAll cr sys = mapM_ f groups
f group = do
let filename = sourceFile (head group)
result <- (siReadFile sys) filename
let contents = fromRight "" result
let contents = either (const "") id result
outputResult filename contents group
outputResult filename contents warnings = do

View File

@ -24,7 +24,6 @@ import ShellCheck.Interface
import ShellCheck.Formatter.Format
import Data.Aeson
import Data.Either
import Data.IORef
import Data.Monoid
import GHC.Exts
@ -119,7 +118,7 @@ collectResult ref cr sys = mapM_ f groups
f group = do
let filename = sourceFile (head group)
result <- siReadFile sys filename
let contents = fromRight "" result
let contents = either (const "") id result
let comments' = makeNonVirtual comments contents
modifyIORef ref (\x -> comments' ++ x)

View File

@ -25,7 +25,6 @@ import ShellCheck.Formatter.Format
import Control.Monad
import Data.Array
import Data.Either
import Data.Foldable
import Data.Ord
import Data.IORef
@ -123,7 +122,7 @@ outputResult options ref result sys = do
outputForFile color sys comments = do
let fileName = sourceFile (head comments)
result <- (siReadFile sys) fileName
let contents = fromRight "" result
let contents = either (const "") id result
let fileLinesList = lines contents
let lineCount = length fileLinesList
let fileLines = listArray (1, lineCount) fileLinesList