Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Shayne Fletcher
Glasgow Haskell Compiler
Commits
c2e301ae
Commit
c2e301ae
authored
Dec 29, 2019
by
Ben Gamari
🐢
Committed by
Marge Bot
Feb 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
compiler: Qualify imports of Data.List
parent
7d452be4
Changes
31
Hide whitespace changes
Inline
Side-by-side
Showing
31 changed files
with
56 additions
and
48 deletions
+56
-48
compiler/GHC/CmmToC.hs
compiler/GHC/CmmToC.hs
+1
-1
compiler/GHC/Iface/Utils.hs
compiler/GHC/Iface/Utils.hs
+1
-1
compiler/backpack/DriverBkp.hs
compiler/backpack/DriverBkp.hs
+1
-1
compiler/basicTypes/Module.hs
compiler/basicTypes/Module.hs
+1
-1
compiler/basicTypes/PatSyn.hs
compiler/basicTypes/PatSyn.hs
+1
-1
compiler/basicTypes/SrcLoc.hs
compiler/basicTypes/SrcLoc.hs
+1
-1
compiler/ghci/ByteCodeAsm.hs
compiler/ghci/ByteCodeAsm.hs
+1
-1
compiler/ghci/Debugger.hs
compiler/ghci/Debugger.hs
+1
-1
compiler/ghci/Linker.hs
compiler/ghci/Linker.hs
+1
-1
compiler/ghci/RtClosureInspect.hs
compiler/ghci/RtClosureInspect.hs
+1
-1
compiler/main/HscMain.hs
compiler/main/HscMain.hs
+1
-1
compiler/main/Plugins.hs
compiler/main/Plugins.hs
+1
-1
compiler/nativeGen/CFG.hs
compiler/nativeGen/CFG.hs
+1
-1
compiler/nativeGen/Reg.hs
compiler/nativeGen/Reg.hs
+1
-1
compiler/simplCore/CoreMonad.hs
compiler/simplCore/CoreMonad.hs
+1
-1
compiler/simplCore/SAT.hs
compiler/simplCore/SAT.hs
+1
-1
compiler/simplCore/SimplEnv.hs
compiler/simplCore/SimplEnv.hs
+1
-1
compiler/stranal/DmdAnal.hs
compiler/stranal/DmdAnal.hs
+1
-1
compiler/typecheck/TcDeriv.hs
compiler/typecheck/TcDeriv.hs
+1
-1
compiler/typecheck/TcDerivInfer.hs
compiler/typecheck/TcDerivInfer.hs
+1
-1
compiler/typecheck/TcEnv.hs
compiler/typecheck/TcEnv.hs
+1
-1
compiler/typecheck/TcExpr.hs
compiler/typecheck/TcExpr.hs
+1
-1
compiler/types/TyCoSubst.hs
compiler/types/TyCoSubst.hs
+1
-1
compiler/types/TyCoTidy.hs
compiler/types/TyCoTidy.hs
+1
-1
compiler/utils/GraphPpr.hs
compiler/utils/GraphPpr.hs
+1
-1
compiler/utils/ListSetOps.hs
compiler/utils/ListSetOps.hs
+7
-7
ghc/Main.hs
ghc/Main.hs
+1
-1
libraries/base/Data/Version.hs
libraries/base/Data/Version.hs
+1
-1
libraries/base/Debug/Trace.hs
libraries/base/Debug/Trace.hs
+1
-1
libraries/base/Prelude.hs
libraries/base/Prelude.hs
+20
-12
libraries/base/Text/Printf.hs
libraries/base/Text/Printf.hs
+1
-1
No files found.
compiler/GHC/CmmToC.hs
View file @
c2e301ae
...
...
@@ -55,7 +55,7 @@ import qualified Data.ByteString as BS
import
Control.Monad.ST
import
Data.Bits
import
Data.Char
import
Data.List
import
Data.List
(
intersperse
)
import
Data.Map
(
Map
)
import
Data.Word
import
System.IO
...
...
compiler/GHC/Iface/Utils.hs
View file @
c2e301ae
...
...
@@ -113,7 +113,7 @@ import ExtractDocs
import
Control.Monad
import
Data.Function
import
Data.List
import
Data.List
(
find
,
findIndex
,
mapAccumL
,
sortBy
,
sort
)
import
qualified
Data.Map
as
Map
import
qualified
Data.Set
as
Set
import
Data.Ord
...
...
compiler/backpack/DriverBkp.hs
View file @
c2e301ae
...
...
@@ -54,7 +54,7 @@ import Util
import
qualified
GHC.LanguageExtensions
as
LangExt
import
Panic
import
Data.List
import
Data.List
(
partition
)
import
System.Exit
import
Control.Monad
import
System.FilePath
...
...
compiler/basicTypes/Module.hs
View file @
c2e301ae
...
...
@@ -146,7 +146,7 @@ import UniqDSet
import
FastString
import
Binary
import
Util
import
Data.List
import
Data.List
(
sortBy
,
sort
)
import
Data.Ord
import
GHC.PackageDb
(
BinaryStringRep
(
..
),
DbUnitIdModuleRep
(
..
),
DbModule
(
..
),
DbUnitId
(
..
))
import
Fingerprint
...
...
compiler/basicTypes/PatSyn.hs
View file @
c2e301ae
...
...
@@ -38,7 +38,7 @@ import FieldLabel
import
qualified
Data.Data
as
Data
import
Data.Function
import
Data.List
import
Data.List
(
find
)
{-
************************************************************************
...
...
compiler/basicTypes/SrcLoc.hs
View file @
c2e301ae
...
...
@@ -98,7 +98,7 @@ import FastString
import
Control.DeepSeq
import
Data.Bits
import
Data.Data
import
Data.List
import
Data.List
(
sortBy
,
intercalate
)
import
Data.Ord
{-
...
...
compiler/ghci/ByteCodeAsm.hs
View file @
c2e301ae
...
...
@@ -55,7 +55,7 @@ import Data.Array.Unsafe( castSTUArray )
import
Foreign
import
Data.Char
(
ord
)
import
Data.List
import
Data.List
(
genericLength
)
import
Data.Map
(
Map
)
import
Data.Maybe
(
fromMaybe
)
import
qualified
Data.Map
as
Map
...
...
compiler/ghci/Debugger.hs
View file @
c2e301ae
...
...
@@ -40,7 +40,7 @@ import DynFlags
import
Exception
import
Control.Monad
import
Data.List
import
Data.List
(
(
\\
)
)
import
Data.Maybe
import
Data.IORef
...
...
compiler/ghci/Linker.hs
View file @
c2e301ae
...
...
@@ -57,7 +57,7 @@ import Control.Monad
import
Data.Char
(
isSpace
)
import
Data.IORef
import
Data.List
import
Data.List
(
intercalate
,
isPrefixOf
,
isSuffixOf
,
nub
,
partition
)
import
Data.Maybe
import
Control.Concurrent.MVar
...
...
compiler/ghci/RtClosureInspect.hs
View file @
c2e301ae
...
...
@@ -62,7 +62,7 @@ import GHC.Runtime.Layout ( roundUpTo )
import
Control.Monad
import
Data.Maybe
import
Data.List
import
Data.List
((
\\
))
#
if
defined
(
INTEGER_GMP
)
import
GHC.Exts
import
Data.Array.Base
...
...
compiler/main/HscMain.hs
View file @
c2e301ae
...
...
@@ -165,7 +165,7 @@ import Stream (Stream)
import
Util
import
Data.List
import
Data.List
(
nub
,
isPrefixOf
,
partition
)
import
Control.Monad
import
Data.IORef
import
System.FilePath
as
FilePath
...
...
compiler/main/Plugins.hs
View file @
c2e301ae
...
...
@@ -60,7 +60,7 @@ import GhcMonad
import
DriverPhases
import
Module
(
ModuleName
,
Module
(
moduleName
))
import
Fingerprint
import
Data.List
import
Data.List
(
sort
)
import
Outputable
(
Outputable
(
..
),
text
,
(
<+>
))
--Qualified import so we can define a Semigroup instance
...
...
compiler/nativeGen/CFG.hs
View file @
c2e301ae
...
...
@@ -80,7 +80,7 @@ import Outputable
import
GHC.Cmm.Ppr
()
-- For Outputable instances
import
qualified
DynFlags
as
D
import
Data.List
import
Data.List
(
sort
,
nub
,
partition
)
import
Data.STRef.Strict
import
Control.Monad.ST
...
...
compiler/nativeGen/Reg.hs
View file @
c2e301ae
...
...
@@ -31,7 +31,7 @@ import GhcPrelude
import
Outputable
import
Unique
import
RegClass
import
Data.List
import
Data.List
(
intersect
)
-- | An identifier for a primitive real machine register.
type
RegNo
...
...
compiler/simplCore/CoreMonad.hs
View file @
c2e301ae
...
...
@@ -71,7 +71,7 @@ import NameEnv
import
SrcLoc
import
Data.Bifunctor
(
bimap
)
import
ErrUtils
(
dumpAction
)
import
Data.List
import
Data.List
(
intersperse
,
groupBy
,
sortBy
)
import
Data.Ord
import
Data.Dynamic
import
Data.IORef
...
...
compiler/simplCore/SAT.hs
View file @
c2e301ae
...
...
@@ -69,7 +69,7 @@ import Unique
import
UniqSet
import
Outputable
import
Data.List
import
Data.List
(
mapAccumL
)
import
FastString
#
include
"HsVersions.h"
...
...
compiler/simplCore/SimplEnv.hs
View file @
c2e301ae
...
...
@@ -69,7 +69,7 @@ import Outputable
import
Util
import
UniqFM
(
pprUniqFM
)
import
Data.List
import
Data.List
(
mapAccumL
)
{-
************************************************************************
...
...
compiler/stranal/DmdAnal.hs
View file @
c2e301ae
...
...
@@ -23,7 +23,7 @@ import CoreSeq ( seqBinds )
import
Outputable
import
VarEnv
import
BasicTypes
import
Data.List
import
Data.List
(
mapAccumL
,
sortBy
)
import
DataCon
import
Id
import
CoreUtils
(
exprIsHNF
,
exprType
,
exprIsTrivial
,
exprOkForSpeculation
)
...
...
compiler/typecheck/TcDeriv.hs
View file @
c2e301ae
...
...
@@ -72,7 +72,7 @@ import qualified GHC.LanguageExtensions as LangExt
import
Control.Monad
import
Control.Monad.Trans.Class
import
Control.Monad.Trans.Reader
import
Data.List
import
Data.List
(
partition
,
find
)
{-
************************************************************************
...
...
compiler/typecheck/TcDerivInfer.hs
View file @
c2e301ae
...
...
@@ -50,7 +50,7 @@ import VarSet
import
Control.Monad
import
Control.Monad.Trans.Class
(
lift
)
import
Control.Monad.Trans.Reader
(
ask
)
import
Data.List
import
Data.List
(
sortBy
)
import
Data.Maybe
----------------------
...
...
compiler/typecheck/TcEnv.hs
View file @
c2e301ae
...
...
@@ -112,7 +112,7 @@ import qualified GHC.LanguageExtensions as LangExt
import
Util
(
HasDebugCallStack
)
import
Data.IORef
import
Data.List
import
Data.List
(
intercalate
)
import
Control.Monad
{- *********************************************************************
...
...
compiler/typecheck/TcExpr.hs
View file @
c2e301ae
...
...
@@ -83,7 +83,7 @@ import UniqSet ( nonDetEltsUniqSet )
import
qualified
GHC.LanguageExtensions
as
LangExt
import
Data.Function
import
Data.List
import
Data.List
(
partition
,
sortBy
,
groupBy
,
intersect
)
import
qualified
Data.Set
as
Set
{-
...
...
compiler/types/TyCoSubst.hs
View file @
c2e301ae
...
...
@@ -80,7 +80,7 @@ import UniqFM
import
UniqSet
import
Outputable
import
Data.List
import
Data.List
(
mapAccumL
)
{-
%************************************************************************
...
...
compiler/types/TyCoTidy.hs
View file @
c2e301ae
...
...
@@ -28,7 +28,7 @@ import Var
import
VarEnv
import
Util
(
seqList
)
import
Data.List
import
Data.List
(
mapAccumL
)
{-
%************************************************************************
...
...
compiler/utils/GraphPpr.hs
View file @
c2e301ae
...
...
@@ -16,7 +16,7 @@ import Unique
import
UniqSet
import
UniqFM
import
Data.List
import
Data.List
(
mapAccumL
)
import
Data.Maybe
...
...
compiler/utils/ListSetOps.hs
View file @
c2e301ae
...
...
@@ -28,7 +28,7 @@ import GhcPrelude
import
Outputable
import
Util
import
Data.List
import
qualified
Data.List
as
L
import
qualified
Data.List.NonEmpty
as
NE
import
Data.List.NonEmpty
(
NonEmpty
(
..
))
import
qualified
Data.Set
as
S
...
...
@@ -40,7 +40,7 @@ getNth xs n = ASSERT2( xs `lengthExceeds` n, ppr n $$ ppr xs )
deleteBys
::
(
a
->
a
->
Bool
)
->
[
a
]
->
[
a
]
->
[
a
]
-- (deleteBys eq xs ys) returns xs-ys, using the given equality function
-- Just like 'Data.List.delete' but with an equality function
deleteBys
eq
xs
ys
=
foldl'
(
flip
(
deleteBy
eq
))
xs
ys
deleteBys
eq
xs
ys
=
foldl'
(
flip
(
L
.
deleteBy
eq
))
xs
ys
{-
************************************************************************
...
...
@@ -153,7 +153,7 @@ equivClasses :: (a -> a -> Ordering) -- Comparison
equivClasses
_
[]
=
[]
equivClasses
_
[
stuff
]
=
[
stuff
:|
[]
]
equivClasses
cmp
items
=
NE
.
groupBy
eq
(
sortBy
cmp
items
)
equivClasses
cmp
items
=
NE
.
groupBy
eq
(
L
.
sortBy
cmp
items
)
where
eq
a
b
=
case
cmp
a
b
of
{
EQ
->
True
;
_
->
False
}
...
...
@@ -166,7 +166,7 @@ removeDups :: (a -> a -> Ordering) -- Comparison function
removeDups
_
[]
=
(
[]
,
[]
)
removeDups
_
[
x
]
=
([
x
],
[]
)
removeDups
cmp
xs
=
case
(
mapAccumR
collect_dups
[]
(
equivClasses
cmp
xs
)
)
of
{
(
dups
,
xs'
)
->
=
case
L
.
mapAccumR
collect_dups
[]
(
equivClasses
cmp
xs
)
of
{
(
dups
,
xs'
)
->
(
xs'
,
dups
)
}
where
collect_dups
::
[
NonEmpty
a
]
->
NonEmpty
a
->
([
NonEmpty
a
],
a
)
...
...
@@ -175,6 +175,6 @@ removeDups cmp xs
findDupsEq
::
(
a
->
a
->
Bool
)
->
[
a
]
->
[
NonEmpty
a
]
findDupsEq
_
[]
=
[]
findDupsEq
eq
(
x
:
xs
)
|
null
eq_xs
=
findDupsEq
eq
xs
|
otherwise
=
(
x
:|
eq_xs
)
:
findDupsEq
eq
neq_xs
where
(
eq_xs
,
neq_xs
)
=
partition
(
eq
x
)
xs
findDupsEq
eq
(
x
:
xs
)
|
L
.
null
eq_xs
=
findDupsEq
eq
xs
|
otherwise
=
(
x
:|
eq_xs
)
:
findDupsEq
eq
neq_xs
where
(
eq_xs
,
neq_xs
)
=
L
.
partition
(
eq
x
)
xs
ghc/Main.hs
View file @
c2e301ae
...
...
@@ -80,7 +80,7 @@ import Control.Monad
import
Control.Monad.Trans.Class
import
Control.Monad.Trans.Except
(
throwE
,
runExceptT
)
import
Data.Char
import
Data.List
import
Data.List
(
isPrefixOf
,
partition
,
intercalate
)
import
Data.Maybe
import
Prelude
...
...
libraries/base/Data/Version.hs
View file @
c2e301ae
...
...
@@ -42,7 +42,7 @@ import Data.Bool ( (&&) )
import
Data.Char
(
isDigit
,
isAlphaNum
)
import
Data.Eq
import
Data.Int
(
Int
)
import
Data.List
import
Data.List
(
map
,
sort
,
concat
,
concatMap
,
intersperse
,
(
++
)
)
import
Data.Ord
import
Data.String
(
String
)
import
GHC.Generics
...
...
libraries/base/Debug/Trace.hs
View file @
c2e301ae
...
...
@@ -53,7 +53,7 @@ import GHC.IO.Encoding
import
GHC.Ptr
import
GHC.Show
import
GHC.Stack
import
Data.List
import
Data.List
(
null
,
partition
)
-- $setup
-- >>> import Prelude
...
...
libraries/base/Prelude.hs
View file @
c2e301ae
...
...
@@ -101,25 +101,32 @@ module Prelude (
seq
,
(
$!
),
-- * List operations
map
,
(
++
),
filter
,
head
,
last
,
tail
,
init
,
null
,
length
,
(
!!
),
reverse
,
List
.
map
,
(
List
.++
),
List
.
filter
,
List
.
head
,
List
.
last
,
List
.
tail
,
List
.
init
,
(
List
.!!
),
Foldable
.
null
,
Foldable
.
length
,
List
.
reverse
,
-- *** Special folds
and
,
or
,
any
,
all
,
concat
,
concatMap
,
Foldable
.
and
,
Foldable
.
or
,
Foldable
.
any
,
Foldable
.
all
,
Foldable
.
concat
,
Foldable
.
concatMap
,
-- ** Building lists
-- *** Scans
scanl
,
scanl1
,
scanr
,
scanr1
,
List
.
scanl
,
List
.
scanl1
,
List
.
scanr
,
List
.
scanr1
,
-- *** Infinite lists
iterate
,
repeat
,
replicate
,
cycle
,
List
.
iterate
,
List
.
repeat
,
List
.
replicate
,
List
.
cycle
,
-- ** Sublists
take
,
drop
,
splitAt
,
takeWhile
,
dropWhile
,
span
,
break
,
List
.
take
,
List
.
drop
,
List
.
takeWhile
,
List
.
dropWhile
,
List
.
span
,
List
.
break
,
List
.
splitAt
,
-- ** Searching lists
notElem
,
lookup
,
Foldable
.
notElem
,
List
.
lookup
,
-- ** Zipping and unzipping lists
zip
,
zip3
,
zipWith
,
zipWith3
,
unzip
,
unzip3
,
List
.
zip
,
List
.
zip3
,
List
.
zipWith
,
List
.
zipWith3
,
List
.
unzip
,
List
.
unzip3
,
-- ** Functions on strings
lines
,
words
,
unlines
,
unwords
,
List
.
lines
,
List
.
words
,
List
.
unlines
,
List
.
unwords
,
-- * Converting to and from @String@
-- ** Converting to @String@
...
...
@@ -157,9 +164,10 @@ module Prelude (
import
Control.Monad
import
System.IO
import
System.IO.Error
import
Data.List
import
qualified
Data.List
as
List
import
Data.Either
import
Data.Foldable
(
Foldable
(
..
)
)
import
qualified
Data.Foldable
as
Foldable
import
Data.Functor
(
(
<$>
)
)
import
Data.Maybe
import
Data.Traversable
(
Traversable
(
..
)
)
...
...
libraries/base/Text/Printf.hs
View file @
c2e301ae
...
...
@@ -94,7 +94,7 @@ module Text.Printf(
import
Data.Char
import
Data.Int
import
Data.List
import
Data.List
(
stripPrefix
)
import
Data.Word
import
Numeric
import
Numeric.Natural
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment