Merge pull request #3977 from ezyang/backpack

Rename 'backpack-includes' to 'mixins'.

Cabal/Distribution/PackageDescription/Check.hs

@@ -1009,7 +1009,7 @@ checkCabalVersion pkg =
     -- check use of thinning and renaming
   , checkVersion [1,25] usesBackpackIncludes $
       PackageDistInexcusable $
-           "To use the 'backpack-includes' field the package needs to specify "
+           "To use the 'mixins' field the package needs to specify "
         ++ "at least 'cabal-version: >= 1.25'."
 
     -- check use of 'extra-framework-dirs' field

Cabal/Distribution/PackageDescription/Parse.hs

@@ -393,7 +393,7 @@ binfoFieldDescrs =
  , commaListFieldWithSep vcat "build-depends"
            disp                   parse
            targetBuildDepends (\xs binfo -> binfo{targetBuildDepends=xs})
- , commaListFieldWithSep vcat "backpack-includes"
+ , commaListFieldWithSep vcat "mixins"
            showBackpackInclude    parseBackpackInclude
            backpackIncludes   (\xs binfo -> binfo{backpackIncludes=xs})
  , spaceListField "cpp-options"

Cabal/changelog

@@ -127,7 +127,7 @@
 	* Macros 'VERSION_$pkgname' and 'MIN_VERSION_$pkgname' are now
 	also generated for the current package. (#3235).
 	* Backpack is supported!  Two new fields supported in Cabal
-	files: signatures and backpack-includes; and a new flag
+	files: signatures and mixins; and a new flag
 	to setup scripts, '--instantiate-with'.  See
 	https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst
 	for more details.

Cabal/tests/PackageTests/Backpack/Includes1/Includes1.cabal

@@ -9,5 +9,5 @@ cabal-version:       >=1.25
 library
   build-depends:       base, containers
   exposed-modules:     A B
-  backpack-includes:   containers (Data.Map)
+  mixins:   containers (Data.Map)
   default-language:    Haskell2010

Cabal/tests/PackageTests/Backpack/Includes2/Includes2.cabal

@@ -27,7 +27,7 @@ library postgresql
 
 library
   build-depends:       base, mysql, postgresql, mylib
-  backpack-includes:
+  mixins:
     mylib (Mine as Mine.MySQL) requires (Database as Database.MySQL),
     mylib (Mine as Mine.PostgreSQL) requires (Database as Database.PostgreSQL)
   exposed-modules:     App

Cabal/tests/PackageTests/Backpack/Includes2/fail.cabal

@@ -27,7 +27,7 @@ library postgresql
 
 library
   build-depends:       base, mysql, postgresql, mylib
-  backpack-includes:
+  mixins:
     mysql (Database.MySQL as Database),
     postgresql (Database.PostgreSQL as Database)
   exposed-modules:     App

Cabal/tests/PackageTests/Backpack/Includes2/src/src.cabal

@@ -8,7 +8,7 @@ cabal-version:       >=1.25
 
 library
   build-depends:       base, mysql, postgresql, mylib
-  backpack-includes:
+  mixins:
     mylib (Mine as Mine.MySQL) requires (Database as Database.MySQL),
     mylib (Mine as Mine.PostgreSQL) requires (Database as Database.PostgreSQL)
   exposed-modules:     App

Cabal/tests/PackageTests/Backpack/Includes5/Includes5.cabal

@@ -14,12 +14,12 @@ library impl
 
 library good
   build-depends: base, impl
-  backpack-includes: impl hiding (Foobar)
+  mixins: impl hiding (Foobar)
   exposed-modules: A
   default-language:    Haskell2010
 
 library bad
   build-depends: base, impl, good
-  backpack-includes: impl hiding (Foobar)
+  mixins: impl hiding (Foobar)
   exposed-modules: B
   default-language:    Haskell2010

Cabal/tests/PackageTests/Backpack/Reexport1/p/p.cabal

@@ -7,7 +7,7 @@ build-type:          Simple
 cabal-version:       >=1.25
 
 library
-  backpack-includes: containers (Data.Map as Map)
+  mixins: containers (Data.Map as Map)
   exposed-modules: P
   reexported-modules: Map
   build-depends:       base, containers

cabal-install/tests/IntegrationTests/backpack/includes2/Includes2.cabal

@@ -27,7 +27,7 @@ library postgresql
 
 library
   build-depends:       base, mysql, postgresql, mylib
-  backpack-includes:
+  mixins:
     mylib (Mine as Mine.MySQL) requires (Database as Database.MySQL),
     mylib (Mine as Mine.PostgreSQL) requires (Database as Database.PostgreSQL)
   exposed-modules:     App

cabal-install/tests/IntegrationTests/backpack/includes2/src/src.cabal

@@ -8,7 +8,7 @@ cabal-version:       >=1.25
 
 library
   build-depends:       base, mysql, postgresql, mylib
-  backpack-includes:
+  mixins:
     mylib (Mine as Mine.MySQL) requires (Database as Database.MySQL),
     mylib (Mine as Mine.PostgreSQL) requires (Database as Database.PostgreSQL)
   exposed-modules:     App