Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
GHC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
4,252
Issues
4,252
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
397
Merge Requests
397
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
bd5810dc
Commit
bd5810dc
authored
May 18, 2020
by
Sylvain Henry
Committed by
Marge Bot
Jun 13, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DynFlags: remove useless add_package parameter
parent
9e715c1b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
compiler/GHC/Unit/State.hs
compiler/GHC/Unit/State.hs
+7
-9
No files found.
compiler/GHC/Unit/State.hs
View file @
bd5810dc
...
...
@@ -2021,7 +2021,7 @@ getPreloadUnitsAnd dflags pkgids0 =
preload
=
preloadUnits
state
parents
=
zip
pkgids
(
repeat
Nothing
)
in
do
all_pkgs
<-
throwErr
dflags
(
foldM
(
add_package
dflags
pkg_map
)
preload
parents
)
all_pkgs
<-
throwErr
dflags
(
foldM
(
add_package
pkg_map
)
preload
parents
)
return
(
map
(
unsafeLookupUnitId
state
)
all_pkgs
)
-- Takes a list of packages, and returns the list with dependencies included,
...
...
@@ -2031,7 +2031,7 @@ closeDeps :: DynFlags
->
[(
UnitId
,
Maybe
UnitId
)]
->
IO
[
UnitId
]
closeDeps
dflags
pkg_map
ps
=
throwErr
dflags
(
closeDepsErr
dflags
pkg_map
ps
)
=
throwErr
dflags
(
closeDepsErr
pkg_map
ps
)
throwErr
::
DynFlags
->
MaybeErr
MsgDoc
a
->
IO
a
throwErr
dflags
m
...
...
@@ -2039,19 +2039,17 @@ throwErr dflags m
Failed
e
->
throwGhcExceptionIO
(
CmdLineError
(
showSDoc
dflags
e
))
Succeeded
r
->
return
r
closeDepsErr
::
DynFlags
->
UnitInfoMap
closeDepsErr
::
UnitInfoMap
->
[(
UnitId
,
Maybe
UnitId
)]
->
MaybeErr
MsgDoc
[
UnitId
]
closeDepsErr
dflags
pkg_map
ps
=
foldM
(
add_package
dflags
pkg_map
)
[]
ps
closeDepsErr
pkg_map
ps
=
foldM
(
add_package
pkg_map
)
[]
ps
-- internal helper
add_package
::
DynFlags
->
UnitInfoMap
add_package
::
UnitInfoMap
->
[
UnitId
]
->
(
UnitId
,
Maybe
UnitId
)
->
MaybeErr
MsgDoc
[
UnitId
]
add_package
dflags
pkg_map
ps
(
p
,
mb_parent
)
add_package
pkg_map
ps
(
p
,
mb_parent
)
|
p
`
elem
`
ps
=
return
ps
-- Check if we've already added this package
|
otherwise
=
case
lookupUnitId'
pkg_map
p
of
...
...
@@ -2063,7 +2061,7 @@ add_package dflags pkg_map ps (p, mb_parent)
return
(
p
:
ps'
)
where
add_unit_key
ps
key
=
add_package
dflags
pkg_map
ps
(
key
,
Just
p
)
=
add_package
pkg_map
ps
(
key
,
Just
p
)
missingPackageMsg
::
Outputable
pkgid
=>
pkgid
->
SDoc
missingPackageMsg
p
=
text
"unknown package:"
<+>
ppr
p
...
...
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