Skip to content

Commit

Permalink
Merge pull request #8929 from haskell/fix8928
Browse files Browse the repository at this point in the history
Fix #8928 Conclude setup messages with an ellipsis
  • Loading branch information
mpilgrem authored Jun 2, 2023
2 parents fb1678b + 5d6af7c commit 6c11a04
Show file tree
Hide file tree
Showing 305 changed files with 1,750 additions and 1,751 deletions.
2 changes: 1 addition & 1 deletion Cabal/src/Distribution/Backpack/DescribeUnitId.hs
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ setupMessage' verbosity msg pkgid cname mb_insts = withFrozenCallStack $ do
msg_doc <+> for_doc
where
msg_doc = text msg <+> text (showComponentName cname)
for_doc = text "for" <+> pretty pkgid <<>> text ".."
for_doc = text "for" <+> pretty pkgid <<>> text "..."
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# Setup configure
Configuring p-0.1.0.0...
# Setup build
Preprocessing library for p-0.1.0.0..
Building library for p-0.1.0.0..
Preprocessing library for p-0.1.0.0...
Building library for p-0.1.0.0...
# Setup copy
Installing library in <PATH>
# Setup register
Registering library for p-0.1.0.0..
Registering library for p-0.1.0.0...
# Setup configure
Configuring q-0.1.0.0...
# Setup build
Preprocessing library for q-0.1.0.0..
Building library for q-0.1.0.0..
Preprocessing library for q-0.1.0.0...
Building library for q-0.1.0.0...
# Setup copy
Installing library in <PATH>
# Setup register
Registering library for q-0.1.0.0..
Registering library for q-0.1.0.0...
# Setup configure
Configuring package-import-0.1.0.0...
# Setup build
Preprocessing executable 'package-import' for package-import-0.1.0.0..
Building executable 'package-import' for package-import-0.1.0.0..
Preprocessing executable 'package-import' for package-import-0.1.0.0...
Building executable 'package-import' for package-import-0.1.0.0...
# package-import
p q
16 changes: 8 additions & 8 deletions cabal-testsuite/PackageTests/Ambiguity/setup-package-import.out
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# Setup configure
Configuring p-0.1.0.0...
# Setup build
Preprocessing library for p-0.1.0.0..
Building library for p-0.1.0.0..
Preprocessing library for p-0.1.0.0...
Building library for p-0.1.0.0...
# Setup copy
Installing library in <PATH>
# Setup register
Registering library for p-0.1.0.0..
Registering library for p-0.1.0.0...
# Setup configure
Configuring q-0.1.0.0...
# Setup build
Preprocessing library for q-0.1.0.0..
Building library for q-0.1.0.0..
Preprocessing library for q-0.1.0.0...
Building library for q-0.1.0.0...
# Setup copy
Installing library in <PATH>
# Setup register
Registering library for q-0.1.0.0..
Registering library for q-0.1.0.0...
# Setup configure
Configuring package-import-0.1.0.0...
# Setup build
Preprocessing executable 'package-import' for package-import-0.1.0.0..
Building executable 'package-import' for package-import-0.1.0.0..
Preprocessing executable 'package-import' for package-import-0.1.0.0...
Building executable 'package-import' for package-import-0.1.0.0...
# package-import
p q
22 changes: 11 additions & 11 deletions cabal-testsuite/PackageTests/Ambiguity/setup-reexport.cabal.out
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
# Setup configure
Configuring p-0.1.0.0...
# Setup build
Preprocessing library for p-0.1.0.0..
Building library for p-0.1.0.0..
Preprocessing library for p-0.1.0.0...
Building library for p-0.1.0.0...
# Setup copy
Installing library in <PATH>
# Setup register
Registering library for p-0.1.0.0..
Registering library for p-0.1.0.0...
# Setup configure
Configuring q-0.1.0.0...
# Setup build
Preprocessing library for q-0.1.0.0..
Building library for q-0.1.0.0..
Preprocessing library for q-0.1.0.0...
Building library for q-0.1.0.0...
# Setup copy
Installing library in <PATH>
# Setup register
Registering library for q-0.1.0.0..
Registering library for q-0.1.0.0...
# Setup configure
Configuring reexport-0.1.0.0...
# Setup build
Preprocessing library for reexport-0.1.0.0..
Building library for reexport-0.1.0.0..
Preprocessing library for reexport-0.1.0.0...
Building library for reexport-0.1.0.0...
# Setup copy
Installing library in <PATH>
# Setup register
Registering library for reexport-0.1.0.0..
Registering library for reexport-0.1.0.0...
# Setup configure
Configuring reexport-test-0.1.0.0...
# Setup build
Preprocessing executable 'reexport-test' for reexport-test-0.1.0.0..
Building executable 'reexport-test' for reexport-test-0.1.0.0..
Preprocessing executable 'reexport-test' for reexport-test-0.1.0.0...
Building executable 'reexport-test' for reexport-test-0.1.0.0...
# reexport-test
p q
22 changes: 11 additions & 11 deletions cabal-testsuite/PackageTests/Ambiguity/setup-reexport.out
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
# Setup configure
Configuring p-0.1.0.0...
# Setup build
Preprocessing library for p-0.1.0.0..
Building library for p-0.1.0.0..
Preprocessing library for p-0.1.0.0...
Building library for p-0.1.0.0...
# Setup copy
Installing library in <PATH>
# Setup register
Registering library for p-0.1.0.0..
Registering library for p-0.1.0.0...
# Setup configure
Configuring q-0.1.0.0...
# Setup build
Preprocessing library for q-0.1.0.0..
Building library for q-0.1.0.0..
Preprocessing library for q-0.1.0.0...
Building library for q-0.1.0.0...
# Setup copy
Installing library in <PATH>
# Setup register
Registering library for q-0.1.0.0..
Registering library for q-0.1.0.0...
# Setup configure
Configuring reexport-0.1.0.0...
# Setup build
Preprocessing library for reexport-0.1.0.0..
Building library for reexport-0.1.0.0..
Preprocessing library for reexport-0.1.0.0...
Building library for reexport-0.1.0.0...
# Setup copy
Installing library in <PATH>
# Setup register
Registering library for reexport-0.1.0.0..
Registering library for reexport-0.1.0.0...
# Setup configure
Configuring reexport-test-0.1.0.0...
# Setup build
Preprocessing executable 'reexport-test' for reexport-test-0.1.0.0..
Building executable 'reexport-test' for reexport-test-0.1.0.0..
Preprocessing executable 'reexport-test' for reexport-test-0.1.0.0...
Building executable 'reexport-test' for reexport-test-0.1.0.0...
# reexport-test
p q
16 changes: 8 additions & 8 deletions cabal-testsuite/PackageTests/AutogenModulesToggling/cabal.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ Build profile: -w ghc-<GHCVER> -O1
In order, the following will be built:
- test-0.1 (exe:autogen-toggle-test) (first run)
Configuring test-0.1...
Preprocessing library for test-0.1..
Building library for test-0.1..
Preprocessing executable 'autogen-toggle-test' for test-0.1..
Building executable 'autogen-toggle-test' for test-0.1..
Preprocessing library for test-0.1...
Building library for test-0.1...
Preprocessing executable 'autogen-toggle-test' for test-0.1...
Building executable 'autogen-toggle-test' for test-0.1...
The module says: Real module, ship to production
# cabal v2-run
Resolving dependencies...
Build profile: -w ghc-<GHCVER> -O1
In order, the following will be built:
- test-0.1 (exe:autogen-toggle-test) (configuration changed)
Configuring test-0.1...
Preprocessing library for test-0.1..
Building library for test-0.1..
Preprocessing executable 'autogen-toggle-test' for test-0.1..
Building executable 'autogen-toggle-test' for test-0.1..
Preprocessing library for test-0.1...
Building library for test-0.1...
Preprocessing executable 'autogen-toggle-test' for test-0.1...
Building executable 'autogen-toggle-test' for test-0.1...
The module says: Prebuilt module, don't use in production
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Setup configure
Configuring Includes1-0.1.0.0...
# Setup build
Preprocessing library for Includes1-0.1.0.0..
Building library for Includes1-0.1.0.0..
Preprocessing library for Includes1-0.1.0.0...
Building library for Includes1-0.1.0.0...
4 changes: 2 additions & 2 deletions cabal-testsuite/PackageTests/Backpack/Includes1/setup.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Setup configure
Configuring Includes1-0.1.0.0...
# Setup build
Preprocessing library for Includes1-0.1.0.0..
Building library for Includes1-0.1.0.0..
Preprocessing library for Includes1-0.1.0.0...
Building library for Includes1-0.1.0.0...
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Resolving dependencies...
Build profile: -w ghc-<GHCVER> -O1
In order, the following will be built:
- mylib-0.1.0.0 (lib) (first run)
Configuring library for mylib-0.1.0.0..
Preprocessing library for mylib-0.1.0.0..
Configuring library for mylib-0.1.0.0...
Preprocessing library for mylib-0.1.0.0...
Building library instantiated with Database = <Database>
for mylib-0.1.0.0..
for mylib-0.1.0.0...
42 changes: 21 additions & 21 deletions cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external.out
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,35 @@ In order, the following will be built:
- mylib-0.1.0.0 (lib with Database=postgresql-0.1.0.0-inplace:Database.PostgreSQL) (first run)
- src-0.1.0.0 (lib) (first run)
- exe-0.1.0.0 (exe:exe) (first run)
Configuring library for mylib-0.1.0.0..
Preprocessing library for mylib-0.1.0.0..
Configuring library for mylib-0.1.0.0...
Preprocessing library for mylib-0.1.0.0...
Building library instantiated with Database = <Database>
for mylib-0.1.0.0..
Configuring library for mysql-0.1.0.0..
Preprocessing library for mysql-0.1.0.0..
Building library for mysql-0.1.0.0..
Configuring library for postgresql-0.1.0.0..
Preprocessing library for postgresql-0.1.0.0..
Building library for postgresql-0.1.0.0..
for mylib-0.1.0.0...
Configuring library for mysql-0.1.0.0...
Preprocessing library for mysql-0.1.0.0...
Building library for mysql-0.1.0.0...
Configuring library for postgresql-0.1.0.0...
Preprocessing library for postgresql-0.1.0.0...
Building library for postgresql-0.1.0.0...
Configuring library instantiated with
Database = mysql-0.1.0.0-inplace:Database.MySQL
for mylib-0.1.0.0..
Preprocessing library for mylib-0.1.0.0..
for mylib-0.1.0.0...
Preprocessing library for mylib-0.1.0.0...
Building library instantiated with
Database = mysql-0.1.0.0-inplace:Database.MySQL
for mylib-0.1.0.0..
for mylib-0.1.0.0...
Configuring library instantiated with
Database = postgresql-0.1.0.0-inplace:Database.PostgreSQL
for mylib-0.1.0.0..
Preprocessing library for mylib-0.1.0.0..
for mylib-0.1.0.0...
Preprocessing library for mylib-0.1.0.0...
Building library instantiated with
Database = postgresql-0.1.0.0-inplace:Database.PostgreSQL
for mylib-0.1.0.0..
Configuring library for src-0.1.0.0..
Preprocessing library for src-0.1.0.0..
Building library for src-0.1.0.0..
Configuring executable 'exe' for exe-0.1.0.0..
Preprocessing executable 'exe' for exe-0.1.0.0..
Building executable 'exe' for exe-0.1.0.0..
for mylib-0.1.0.0...
Configuring library for src-0.1.0.0...
Preprocessing library for src-0.1.0.0...
Building library for src-0.1.0.0...
Configuring executable 'exe' for exe-0.1.0.0...
Preprocessing executable 'exe' for exe-0.1.0.0...
Building executable 'exe' for exe-0.1.0.0...
# exe exe
"minemysql minepostgresql"
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Resolving dependencies...
Build profile: -w ghc-<GHCVER> -O1
In order, the following will be built:
- Includes2-0.1.0.0 (lib:mylib) (first run)
Configuring library 'mylib' for Includes2-0.1.0.0..
Preprocessing library 'mylib' for Includes2-0.1.0.0..
Configuring library 'mylib' for Includes2-0.1.0.0...
Preprocessing library 'mylib' for Includes2-0.1.0.0...
Building library 'mylib' instantiated with Database = <Database>
for Includes2-0.1.0.0..
for Includes2-0.1.0.0...
42 changes: 21 additions & 21 deletions cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.out
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,35 @@ In order, the following will be built:
- Includes2-0.1.0.0 (lib:mylib with Database=Includes2-0.1.0.0-inplace-postgresql:Database.PostgreSQL) (first run)
- Includes2-0.1.0.0 (lib) (first run)
- Includes2-0.1.0.0 (exe:exe) (first run)
Configuring library 'mylib' for Includes2-0.1.0.0..
Preprocessing library 'mylib' for Includes2-0.1.0.0..
Configuring library 'mylib' for Includes2-0.1.0.0...
Preprocessing library 'mylib' for Includes2-0.1.0.0...
Building library 'mylib' instantiated with Database = <Database>
for Includes2-0.1.0.0..
Configuring library 'mysql' for Includes2-0.1.0.0..
Preprocessing library 'mysql' for Includes2-0.1.0.0..
Building library 'mysql' for Includes2-0.1.0.0..
Configuring library 'postgresql' for Includes2-0.1.0.0..
Preprocessing library 'postgresql' for Includes2-0.1.0.0..
Building library 'postgresql' for Includes2-0.1.0.0..
for Includes2-0.1.0.0...
Configuring library 'mysql' for Includes2-0.1.0.0...
Preprocessing library 'mysql' for Includes2-0.1.0.0...
Building library 'mysql' for Includes2-0.1.0.0...
Configuring library 'postgresql' for Includes2-0.1.0.0...
Preprocessing library 'postgresql' for Includes2-0.1.0.0...
Building library 'postgresql' for Includes2-0.1.0.0...
Configuring library 'mylib' instantiated with
Database = Includes2-0.1.0.0-inplace-mysql:Database.MySQL
for Includes2-0.1.0.0..
Preprocessing library 'mylib' for Includes2-0.1.0.0..
for Includes2-0.1.0.0...
Preprocessing library 'mylib' for Includes2-0.1.0.0...
Building library 'mylib' instantiated with
Database = Includes2-0.1.0.0-inplace-mysql:Database.MySQL
for Includes2-0.1.0.0..
for Includes2-0.1.0.0...
Configuring library 'mylib' instantiated with
Database = Includes2-0.1.0.0-inplace-postgresql:Database.PostgreSQL
for Includes2-0.1.0.0..
Preprocessing library 'mylib' for Includes2-0.1.0.0..
for Includes2-0.1.0.0...
Preprocessing library 'mylib' for Includes2-0.1.0.0...
Building library 'mylib' instantiated with
Database = Includes2-0.1.0.0-inplace-postgresql:Database.PostgreSQL
for Includes2-0.1.0.0..
Configuring library for Includes2-0.1.0.0..
Preprocessing library for Includes2-0.1.0.0..
Building library for Includes2-0.1.0.0..
Configuring executable 'exe' for Includes2-0.1.0.0..
Preprocessing executable 'exe' for Includes2-0.1.0.0..
Building executable 'exe' for Includes2-0.1.0.0..
for Includes2-0.1.0.0...
Configuring library for Includes2-0.1.0.0...
Preprocessing library for Includes2-0.1.0.0...
Building library for Includes2-0.1.0.0...
Configuring executable 'exe' for Includes2-0.1.0.0...
Preprocessing executable 'exe' for Includes2-0.1.0.0...
Building executable 'exe' for Includes2-0.1.0.0...
# Includes2 exe
"minemysql minepostgresql"
Loading

0 comments on commit 6c11a04

Please sign in to comment.