diff options
| author | Michael Sloan <mgsloan@gmail.com> | 2019-03-14 16:01:44 -0700 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-04-01 03:32:30 -0400 |
| commit | 061276ea5d265eb3c23a3698f0a10f6a764ff4b4 (patch) | |
| tree | 594bfe4d2ec7f3958d0b96f1ecac3d9f15823a85 | |
| parent | a3971b4e8cb2f07387fbc165d46cd861a914c193 (diff) | |
| download | haskell-061276ea5d265eb3c23a3698f0a10f6a764ff4b4.tar.gz | |
Remove unnecessary uses of UnboxedTuples pragma (see #13101 / #15454)
Also removes a couple unnecessary MagicHash pragmas
| -rw-r--r-- | compiler/codeGen/StgCmmMonad.hs | 2 | ||||
| -rw-r--r-- | compiler/ghci/ByteCodeLink.hs | 1 | ||||
| -rw-r--r-- | compiler/ghci/RtClosureInspect.hs | 2 | ||||
| -rw-r--r-- | compiler/main/InteractiveEval.hs | 2 | ||||
| -rw-r--r-- | compiler/utils/Binary.hs | 2 | ||||
| -rw-r--r-- | ghc/GHCi/UI/Monad.hs | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/compiler/codeGen/StgCmmMonad.hs b/compiler/codeGen/StgCmmMonad.hs index b93e0ab6eb..18956006a8 100644 --- a/compiler/codeGen/StgCmmMonad.hs +++ b/compiler/codeGen/StgCmmMonad.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE GADTs, UnboxedTuples #-} +{-# LANGUAGE GADTs #-} ----------------------------------------------------------------------------- -- diff --git a/compiler/ghci/ByteCodeLink.hs b/compiler/ghci/ByteCodeLink.hs index 9a5fb39e6d..f2a368ba5c 100644 --- a/compiler/ghci/ByteCodeLink.hs +++ b/compiler/ghci/ByteCodeLink.hs @@ -3,7 +3,6 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MagicHash #-} {-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE UnboxedTuples #-} {-# OPTIONS_GHC -optc-DNON_POSIX_SOURCE #-} -- -- (c) The University of Glasgow 2002-2006 diff --git a/compiler/ghci/RtClosureInspect.hs b/compiler/ghci/RtClosureInspect.hs index c64ffa9ec3..c30d06ff3d 100644 --- a/compiler/ghci/RtClosureInspect.hs +++ b/compiler/ghci/RtClosureInspect.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE BangPatterns, CPP, ScopedTypeVariables, MagicHash, UnboxedTuples #-} +{-# LANGUAGE BangPatterns, CPP, ScopedTypeVariables, MagicHash #-} ----------------------------------------------------------------------------- -- diff --git a/compiler/main/InteractiveEval.hs b/compiler/main/InteractiveEval.hs index 2c04029e88..11b0e57126 100644 --- a/compiler/main/InteractiveEval.hs +++ b/compiler/main/InteractiveEval.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE CPP, MagicHash, NondecreasingIndentation, UnboxedTuples, +{-# LANGUAGE CPP, MagicHash, NondecreasingIndentation, RecordWildCards, BangPatterns #-} -- ----------------------------------------------------------------------------- diff --git a/compiler/utils/Binary.hs b/compiler/utils/Binary.hs index 623ba00244..e6dfa3da2c 100644 --- a/compiler/utils/Binary.hs +++ b/compiler/utils/Binary.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE CPP, MagicHash, UnboxedTuples #-} +{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE PolyKinds #-} {-# LANGUAGE ScopedTypeVariables #-} diff --git a/ghc/GHCi/UI/Monad.hs b/ghc/GHCi/UI/Monad.hs index fb887275d7..16bcd20ee4 100644 --- a/ghc/GHCi/UI/Monad.hs +++ b/ghc/GHCi/UI/Monad.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE CPP, FlexibleInstances, UnboxedTuples, MagicHash #-} +{-# LANGUAGE CPP, FlexibleInstances #-} {-# OPTIONS_GHC -fno-cse -fno-warn-orphans #-} -- -fno-cse is needed for GLOBAL_VAR's to behave properly |