Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
178e2318
Commit
178e2318
authored
Jan 12, 2017
by
Robert Henderson
Browse files
Fixed error message and comment.
parent
60e3a6a0
Changes
2
Hide whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/Targets.hs
View file @
178e2318
...
@@ -729,8 +729,9 @@ readUserConstraint str =
...
@@ -729,8 +729,9 @@ readUserConstraint str =
Just
c
->
Right
c
Just
c
->
Right
c
where
where
msgCannotParse
=
msgCannotParse
=
"expected a package name followed by a constraint, which is "
"expected a (possibly qualified) package name followed by a "
++
++
"either a version range, 'installed', 'source' or flags"
"constraint, which is either a version range, 'installed', "
++
"'source', 'test', 'bench', or flags"
instance
Text
UserConstraint
where
instance
Text
UserConstraint
where
disp
(
UserConstraint
qual
name
prop
)
=
disp
(
UserConstraint
qual
name
prop
)
=
...
...
cabal-install/Distribution/Solver/Types/PackagePath.hs
View file @
178e2318
...
@@ -41,7 +41,7 @@ data Namespace =
...
@@ -41,7 +41,7 @@ data Namespace =
instance
Binary
Namespace
instance
Binary
Namespace
-- | Pretty-prints a namespace. The result is either empty or
-- | Pretty-prints a namespace. The result is either empty or
-- ends in a period, so it can be prepended onto a
package name
.
-- ends in a period, so it can be prepended onto a
qualifier
.
dispNamespace
::
Namespace
->
Disp
.
Doc
dispNamespace
::
Namespace
->
Disp
.
Doc
dispNamespace
DefaultNamespace
=
Disp
.
empty
dispNamespace
DefaultNamespace
=
Disp
.
empty
dispNamespace
(
Independent
i
)
=
Disp
.
int
i
<<>>
Disp
.
text
"."
dispNamespace
(
Independent
i
)
=
Disp
.
int
i
<<>>
Disp
.
text
"."
...
...
Write
Preview
Supports
Markdown
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