From e973e5b7a4a384748ff47cb41691f6f887bb6834 Mon Sep 17 00:00:00 2001 From: Patrick Thomson Date: Mon, 27 Jan 2020 12:35:07 -0500 Subject: [PATCH 1/3] Blow the cache. --- .github/workflows/haskell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index e1d1ed4b6..a1ff30ef2 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -37,7 +37,7 @@ jobs: name: Cache ~/.cabal/store with: path: ~/.cabal/store - key: ${{ runner.os }}-${{ matrix.ghc }}-v3-cabal-store + key: ${{ runner.os }}-${{ matrix.ghc }}-v4-cabal-store - uses: actions/cache@v1 name: Cache dist-newstyle From 4e969c77fe74db282fa1891c7c5de37f0ae64da2 Mon Sep 17 00:00:00 2001 From: Ayman Nadeem Date: Mon, 27 Jan 2020 12:52:16 -0500 Subject: [PATCH 2/3] alphabetize imports --- semantic-source/src/Source/Loc.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semantic-source/src/Source/Loc.hs b/semantic-source/src/Source/Loc.hs index 3007c42da..8bd1c9fe9 100644 --- a/semantic-source/src/Source/Loc.hs +++ b/semantic-source/src/Source/Loc.hs @@ -7,13 +7,13 @@ module Source.Loc ) where import Control.DeepSeq (NFData) +import Data.Aeson (ToJSON(..), object, (.=)) import Data.Hashable (Hashable) import Data.Monoid.Generic import GHC.Generics (Generic) import Prelude hiding (span) import Source.Range import Source.Span -import Data.Aeson (ToJSON(..), object, (.=)) data Loc = Loc { byteRange :: {-# UNPACK #-} !Range From 7eff25d791496045e296e4adac5692795143745b Mon Sep 17 00:00:00 2001 From: Ayman Nadeem Date: Mon, 27 Jan 2020 12:55:16 -0500 Subject: [PATCH 3/3] don't need OverloadedStrings anymore --- semantic-source/src/Source/Range.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semantic-source/src/Source/Range.hs b/semantic-source/src/Source/Range.hs index 9687c553e..4ec414415 100644 --- a/semantic-source/src/Source/Range.hs +++ b/semantic-source/src/Source/Range.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE DeriveAnyClass, DeriveGeneric, RankNTypes, NamedFieldPuns, OverloadedStrings #-} +{-# LANGUAGE DeriveAnyClass, DeriveGeneric, RankNTypes, NamedFieldPuns #-} module Source.Range ( Range(..) , point