Skip to content

Include provenance in Backpack unfilled requirements error #11631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jappeace wants to merge 1 commit into
base: master
Choose a base branch
from
+68 −3
Open

Include provenance in Backpack unfilled requirements error #11631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion Cabal/src/Distribution/Backpack/LinkedComponent.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,17 @@ toLinkedComponent
hang
(text "Non-library component has unfilled requirements:")
4
(vcat [pretty req | req <- Set.toList reqs])
( vcat
[ case Map.lookup req (modScopeRequires linked_shape0) of
Just srcs@(_ : _) ->
hang
(pretty req)
4
(vcat [text "brought into scope by" <+> dispModuleSource (getSource src) | src <- srcs])
_ -> pretty req
| req <- Set.toList reqs
]
)

-- NB: do NOT include hidden modules here: GHC 7.10's ghc-pkg
-- won't allow it (since someone could directly synthesize
Expand Down
3 changes: 2 additions & 1 deletion cabal-testsuite/PackageTests/Backpack/Fail3/setup.cabal.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Setup configure
Configuring Fail1-0.1.0.0...
Error:
Non-library component has unfilled requirements: UnfilledSig
Non-library component has unfilled requirements:
UnfilledSig brought into scope by build-depends: Fail1
In the stanza executable foo
3 changes: 2 additions & 1 deletion cabal-testsuite/PackageTests/Backpack/Fail3/setup.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Setup configure
Configuring Fail1-0.1.0.0...
Error:
Non-library component has unfilled requirements: UnfilledSig
Non-library component has unfilled requirements:
UnfilledSig brought into scope by build-depends: Fail1
In the stanza executable foo
1 change: 1 addition & 0 deletions cabal-testsuite/PackageTests/Backpack/Fail3/setup.test.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ main = setupAndCabalTest $ do
skipUnlessGhcVersion ">= 8.1"
r <- fails $ setup' "configure" []
assertOutputContains "UnfilledSig" r
assertOutputContains "brought into scope by" r
return ()
24 changes: 24 additions & 0 deletions cabal-testsuite/PackageTests/Backpack/Fail4/Fail4.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
cabal-version: 3.0
name: Fail4
version: 0.1.0.0
license: BSD-3-Clause
author: Edward Z. Yang
maintainer: ezyang@cs.stanford.edu
build-type: Simple

library sig-lib-a
signatures: UnfilledSig
build-depends: base
hs-source-dirs: lib-a
default-language: Haskell2010

library sig-lib-b
signatures: UnfilledSig
build-depends: base
hs-source-dirs: lib-b
default-language: Haskell2010

executable foo
build-depends: Fail4:sig-lib-a, Fail4:sig-lib-b
main-is: Main.hs
default-language: Haskell2010
1 change: 1 addition & 0 deletions cabal-testsuite/PackageTests/Backpack/Fail4/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
main = return ()
1 change: 1 addition & 0 deletions cabal-testsuite/PackageTests/Backpack/Fail4/lib-a/UnfilledSig.hsig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
signature UnfilledSig where
1 change: 1 addition & 0 deletions cabal-testsuite/PackageTests/Backpack/Fail4/lib-b/UnfilledSig.hsig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
signature UnfilledSig where
8 changes: 8 additions & 0 deletions cabal-testsuite/PackageTests/Backpack/Fail4/setup.cabal.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Setup configure
Configuring Fail4-0.1.0.0...
Error:
Non-library component has unfilled requirements:
UnfilledSig
brought into scope by build-depends: Fail4:sig-lib-a
brought into scope by build-depends: Fail4:sig-lib-b
In the stanza executable foo
8 changes: 8 additions & 0 deletions cabal-testsuite/PackageTests/Backpack/Fail4/setup.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Setup configure
Configuring Fail4-0.1.0.0...
Error:
Non-library component has unfilled requirements:
UnfilledSig
brought into scope by build-depends: Fail4:sig-lib-a
brought into scope by build-depends: Fail4:sig-lib-b
In the stanza executable foo
9 changes: 9 additions & 0 deletions cabal-testsuite/PackageTests/Backpack/Fail4/setup.test.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import Test.Cabal.Prelude

main = setupAndCabalTest $ do
skipUnlessGhcVersion ">= 8.1"
r <- fails $ setup' "configure" []
assertOutputContains "UnfilledSig" r
assertOutputContains "brought into scope by build-depends: Fail4:sig-lib-a" r
assertOutputContains "brought into scope by build-depends: Fail4:sig-lib-b" r
return ()
Loading