Remove "colon specifier is experimental feature"

Same for "visibility is experimental feature" With haskell#7270 fixed, it's time to allow hackage uploads Closes haskell#6801
fgaz · May 2, 2022 · 0cdca20 · 0cdca20
1 parent 6adea7a
commit 0cdca20
Show file tree

Hide file tree

Showing 20 changed files with 2 additions and 32 deletions.
diff --git a/Cabal-syntax/src/Distribution/Types/Dependency.hs b/Cabal-syntax/src/Distribution/Types/Dependency.hs
@@ -145,7 +145,6 @@ instance Parsec Dependency where
  libs <- option mainLibSet $ do
  _ <- char ':'
  versionGuardMultilibs
- parsecWarning PWTExperimental "colon specifier is experimental feature (issue #5660)"
  NES.singleton <$> parseLib <|> parseMultipleLibs
 
  spaces -- https://github.com/haskell/cabal/issues/5846

diff --git a/Cabal-syntax/src/Distribution/Types/LibraryVisibility.hs b/Cabal-syntax/src/Distribution/Types/LibraryVisibility.hs
@@ -33,7 +33,6 @@ instance Pretty LibraryVisibility where
 instance Parsec LibraryVisibility where
  parsec = do
  name <- P.munch1 isAlpha
- parsecWarning PWTExperimental "visibility is experimental feature (issue #5660)"
  case name of
  "public" -> return LibraryVisibilityPublic
  "private" -> return LibraryVisibilityPrivate

diff --git a/Cabal-syntax/src/Distribution/Types/Mixin.hs b/Cabal-syntax/src/Distribution/Types/Mixin.hs
@@ -63,7 +63,6 @@ instance Parsec Mixin where
  ln <- P.option LMainLibName $ do
  _ <- P.char ':'
  versionGuardMultilibs
- parsecWarning PWTExperimental "colon specifier is experimental feature (issue #5660)"
  LSubLibName <$> parsec
  P.spaces
  incl <- parsec

diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-5846.format b/Cabal-tests/tests/ParserTests/regressions/issue-5846.format
@@ -1,7 +1,3 @@
-issue-5846.cabal:11:23: colon specifier is experimental feature (issue #5660)
-issue-5846.cabal:10:23: colon specifier is experimental feature (issue #5660)
-issue-5846.cabal:7:23: colon specifier is experimental feature (issue #5660)
-issue-5846.cabal:8:23: colon specifier is experimental feature (issue #5660)
 cabal-version: 3.0
 name: issue
 version: 5846

diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-6083-a.format b/Cabal-tests/tests/ParserTests/regressions/issue-6083-a.format
@@ -1,5 +1,3 @@
-issue-6083-a.cabal:19:31: colon specifier is experimental feature (issue #5660)
-issue-6083-a.cabal:8:30: colon specifier is experimental feature (issue #5660)
 cabal-version: 3.4
 name: issue
 version: 6083

diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-6083-b.format b/Cabal-tests/tests/ParserTests/regressions/issue-6083-b.format
@@ -1,4 +1,3 @@
-issue-6083-b.cabal:19:31: colon specifier is experimental feature (issue #5660)
 cabal-version: 3.0
 name: issue
 version: 6083

diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.format b/Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.format
@@ -1,4 +1,3 @@
-issue-6083-pkg-pkg.cabal:9:27: colon specifier is experimental feature (issue #5660)
 cabal-version: 3.0
 name: issue
 version: 6083

diff --git a/Cabal-tests/tests/ParserTests/regressions/public-multilib-1.cabal b/Cabal-tests/tests/ParserTests/regressions/public-multilib-1.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 name: public-multilib1
 version: 0
-synopsis: public-multilibs are not polished enough for Hackage
+synopsis: public-multilibs
 category: Tests
 license: MIT
 

diff --git a/Cabal-tests/tests/ParserTests/regressions/public-multilib-1.check b/Cabal-tests/tests/ParserTests/regressions/public-multilib-1.check
@@ -1,3 +1,2 @@
-public-multilib-1.cabal:16:27: visibility is experimental feature (issue #5660)
 No 'maintainer' field.
 No 'description' field.
diff --git a/Cabal-tests/tests/ParserTests/regressions/public-multilib-2.cabal b/Cabal-tests/tests/ParserTests/regressions/public-multilib-2.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 name: public-multilib1
 version: 0
-synopsis: public-multilibs are not polished enough for Hackage
+synopsis: public-multilibs
 category: Tests
 license: MIT
 

diff --git a/Cabal-tests/tests/ParserTests/regressions/public-multilib-2.check b/Cabal-tests/tests/ParserTests/regressions/public-multilib-2.check
@@ -1,3 +1,2 @@
-public-multilib-2.cabal:12:15: colon specifier is experimental feature (issue #5660)
 No 'maintainer' field.
 No 'description' field.
diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/Successful/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/Successful/cabal.out
@@ -4,11 +4,9 @@ Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - pkg-def-0.1.0.0 (lib:publib) (first run)
  - pkg-abc-0.1.0.0 (exe:program) (first run)
-Warning: pkg-def.cabal:10:27: visibility is experimental feature (issue #5660)
 Configuring library 'publib' for pkg-def-0.1.0.0..
 Preprocessing library 'publib' for pkg-def-0.1.0.0..
 Building library 'publib' for pkg-def-0.1.0.0..
-Warning: pkg-abc.cabal:10:15: colon specifier is experimental feature (issue #5660)
 Configuring executable 'program' for pkg-abc-0.1.0.0..
 Preprocessing executable 'program' for pkg-abc-0.1.0.0..
 Building executable 'program' for pkg-abc-0.1.0.0..
diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6083Post/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6083Post/cabal.out
@@ -4,11 +4,9 @@ Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - pkg-def-0.1.0.0 (lib) (first run)
  - pkg-abc-0.1.0.0 (exe:program) (first run)
-Warning: pkg-def.cabal:13:27: visibility is experimental feature (issue #5660)
 Configuring library for pkg-def-0.1.0.0..
 Preprocessing library for pkg-def-0.1.0.0..
 Building library for pkg-def-0.1.0.0..
-Warning: pkg-abc.cabal:19:15: colon specifier is experimental feature (issue #5660)
 Configuring executable 'program' for pkg-abc-0.1.0.0..
 Preprocessing executable 'program' for pkg-abc-0.1.0.0..
 Building executable 'program' for pkg-abc-0.1.0.0..
diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6083PostMixin/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6083PostMixin/cabal.out
@@ -4,12 +4,9 @@ Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - pkg-def-0.1.0.0 (lib) (first run)
  - pkg-abc-0.1.0.0 (exe:program) (first run)
-Warning: pkg-def.cabal:13:27: visibility is experimental feature (issue #5660)
 Configuring library for pkg-def-0.1.0.0..
 Preprocessing library for pkg-def-0.1.0.0..
 Building library for pkg-def-0.1.0.0..
-Warning: pkg-abc.cabal:15:29: colon specifier is experimental feature (issue #5660)
-Warning: pkg-abc.cabal:20:15: colon specifier is experimental feature (issue #5660)
 Configuring executable 'program' for pkg-abc-0.1.0.0..
 Preprocessing executable 'program' for pkg-abc-0.1.0.0..
 Building executable 'program' for pkg-abc-0.1.0.0..
diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6083Pre/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6083Pre/cabal.out
@@ -4,11 +4,9 @@ Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - pkg-abc-0.1.0.0 (lib:pkg-def) (first run)
  - pkg-abc-0.1.0.0 (exe:program) (first run)
-Warning: pkg-abc.cabal:19:15: colon specifier is experimental feature (issue #5660)
 Configuring library 'pkg-def' for pkg-abc-0.1.0.0..
 Preprocessing library 'pkg-def' for pkg-abc-0.1.0.0..
 Building library 'pkg-def' for pkg-abc-0.1.0.0..
-Warning: pkg-abc.cabal:19:15: colon specifier is experimental feature (issue #5660)
 Configuring executable 'program' for pkg-abc-0.1.0.0..
 Preprocessing executable 'program' for pkg-abc-0.1.0.0..
 Building executable 'program' for pkg-abc-0.1.0.0..
diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6083PreMixin/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6083PreMixin/cabal.out
@@ -4,11 +4,9 @@ Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - pkg-abc-0.1.0.0 (lib:pkg-def) (first run)
  - pkg-abc-0.1.0.0 (exe:program) (first run)
-Warning: pkg-abc.cabal:20:15: colon specifier is experimental feature (issue #5660)
 Configuring library 'pkg-def' for pkg-abc-0.1.0.0..
 Preprocessing library 'pkg-def' for pkg-abc-0.1.0.0..
 Building library 'pkg-def' for pkg-abc-0.1.0.0..
-Warning: pkg-abc.cabal:20:15: colon specifier is experimental feature (issue #5660)
 Configuring executable 'program' for pkg-abc-0.1.0.0..
 Preprocessing executable 'program' for pkg-abc-0.1.0.0..
 Building executable 'program' for pkg-abc-0.1.0.0..
diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6894/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6894/cabal.out
@@ -4,11 +4,9 @@ Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - issue-6894 (lib:sublib) (first run)
  - issue-6894 (lib) (first run)
-Warning: issue.cabal:7:30: colon specifier is experimental feature (issue #5660)
 Configuring library 'sublib' for issue-6894..
 Preprocessing library 'sublib' for issue-6894..
 Building library 'sublib' for issue-6894..
-Warning: issue.cabal:7:30: colon specifier is experimental feature (issue #5660)
 Configuring library for issue-6894..
 Preprocessing library for issue-6894..
 Building library for issue-6894..
diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6894/setup.cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6894/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Warning: issue.cabal:7:30: colon specifier is experimental feature (issue #5660)
 Configuring issue-6894...
 # Setup build
 Preprocessing library 'sublib' for issue-6894..

diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6894/setup.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6894/setup.out
@@ -1,5 +1,4 @@
 # Setup configure
-Warning: issue.cabal:7:30: colon specifier is experimental feature (issue #5660)
 Configuring issue-6894...
 # Setup build
 Preprocessing library 'sublib' for issue-6894..

diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T7270/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T7270/cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Warning: dep.cabal:11:30: visibility is experimental feature (issue #5660)
 Configuring dep-0.1.0.0...
 # Setup build
 Preprocessing library 'sublib' for dep-0.1.0.0..
@@ -13,7 +12,6 @@ Installing library in <PATH>
 Registering library 'sublib' for dep-0.1.0.0..
 Registering library for dep-0.1.0.0..
 # Setup configure
-Warning: p.cabal:9:28: colon specifier is experimental feature (issue #5660)
 Configuring p-0.1.0.0...
 # Setup build
 Preprocessing library for p-0.1.0.0..