TOSQUASH annoying GHC version fixup

Author: nfrisby

ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ChainSync/Client/Jumping.hs

@@ -4,6 +4,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
@@ -303,7 +304,11 @@ mkJumping peerContext = Jumping
         atomically (nextInstruction (pure ()) peerContext) >>= \case
             Strict.Right instr -> pure instr
             Strict.Left () -> do
-                traceWith (tracer peerContext) BlockedOnJump
+                -- Need to use NamedFieldPuns somewhere in this module,
+                -- otherwise stylish-haskell complains. But if I remove the
+                -- LANGUAGE pragma, then there's a lot of name-shadowing
+                -- warnings.
+                traceWith (let Context{tracer} = peerContext in tracer) BlockedOnJump
                 id
                   $ fmap (Strict.either absurd id)
                   $ atomically

ouroboros-consensus/src/unstable-consensus-testlib/Test/CsjModel.hs

@@ -26,7 +26,7 @@ module Test.CsjModel (
 
 import           Cardano.Slotting.Slot (SlotNo (unSlotNo),
                      WithOrigin (At, Origin))
-import           Control.Applicative ((<|>))
+import           Control.Applicative (Applicative (..), (<|>))
 import           Control.Arrow (first)
 import           Control.Monad (guard)
 import qualified Control.Monad.State.Strict as State
@@ -43,12 +43,16 @@ import           Data.Strict.Maybe (Maybe (Just, Nothing), fromMaybe, maybe)
 import           Data.Word (Word64)
 import           GHC.Generics (Generic)
 import           NoThunks.Class (NoThunks)
-import           Prelude hiding (Either (Left, Right), Maybe (Just, Nothing),
-                     either, maybe)
+import           Prelude hiding (Applicative (..), Either (Left, Right),
+                     Foldable (..), Maybe (Just, Nothing), either, maybe)
 import           Test.CsjModel.NonEmptySeq
 import           Test.CsjModel.Perm
 import           Test.CsjModel.StateTypes
 
+-- The weird Prelude hiding Applicative and Foldable trick in the above import
+-- list is to deal with recent versions of base adding exports of 'liftA2' and
+-- 'foldl''.
+
 {-------------------------------------------------------------------------------
   Stimuli to and reactions of the CSJ governor
 -------------------------------------------------------------------------------}