Fix breakage caused by parsing module rename (#72)

JordanMartinez · web-flow · commit 69ee908c173c · 2022-03-31T10:13:46.000-05:00
* Fix breakage caused by parsing module rename

* Bust CI cache

* Fix formatting
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Cache PureScript dependencies
         uses: actions/cache@v2
         with:
-          key: ${{ runner.os }}-spago-${{ hashFiles('**/*.dhall') }}
+          key: ${{ runner.os }}-spago-${{ hashFiles('**/*.dhall') }}-2
           path: |
             .spago
             output
diff --git a/src/URI/AbsoluteURI.purs b/src/URI/AbsoluteURI.purs
@@ -22,9 +22,9 @@ import Data.Lens (Lens', lens)
 import Data.Maybe (Maybe(..))
 import Data.Show.Generic (genericShow)
 import Data.String as String
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.Combinators (optionMaybe)
-import Text.Parsing.Parser.String (eof)
+import Parsing (Parser)
+import Parsing.Combinators (optionMaybe)
+import Parsing.String (eof)
 import URI.Common (URIPartParseError, wrapParser)
 import URI.HierarchicalPart (Authority(..), AuthorityOptions, AuthorityParseOptions, AuthorityPrintOptions, HierPath, HierarchicalPart(..), HierarchicalPartOptions, HierarchicalPartParseOptions, HierarchicalPartPrintOptions, Host(..), IPv4Address, IPv6Address, Path(..), PathAbsolute(..), PathRootless(..), Port, RegName, UserInfo, _IPv4Address, _IPv6Address, _NameAddress, _authority, _hierPath, _hosts, _path, _userInfo)
 import URI.HierarchicalPart as HPart
diff --git a/src/URI/Authority.purs b/src/URI/Authority.purs
@@ -19,9 +19,9 @@ import Data.Generic.Rep (class Generic)
 import Data.Lens (Lens', lens)
 import Data.Maybe (Maybe(..))
 import Data.Show.Generic (genericShow)
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.Combinators (optionMaybe, try)
-import Text.Parsing.Parser.String (char, string)
+import Parsing (Parser)
+import Parsing.Combinators (optionMaybe, try)
+import Parsing.String (char, string)
 import URI.Common (URIPartParseError, wrapParser)
 import URI.Host (Host(..), IPv4Address, IPv6Address, RegName, _IPv4Address, _IPv6Address, _NameAddress)
 import URI.Port (Port)
diff --git a/src/URI/Common.purs b/src/URI/Common.purs
@@ -29,10 +29,10 @@ import Data.String.NonEmpty (joinWith, toString, unsafeFromString) as NES
 import Data.String.NonEmpty.CodeUnits (singleton) as NES
 import JSURI (decodeURIComponent, encodeURIComponent)
 import Partial.Unsafe (unsafePartial)
-import Text.Parsing.Parser (ParseError(..), ParseState(..), Parser, ParserT, runParser)
-import Text.Parsing.Parser.Pos (initialPos)
-import Text.Parsing.Parser.String (anyChar, char, eof, oneOf, satisfy)
-import Text.Parsing.Parser.Token (digit, hexDigit)
+import Parsing (ParseError(..), ParseState(..), Parser, ParserT, runParser)
+import Parsing.Pos (initialPos)
+import Parsing.String (anyChar, char, eof, oneOf, satisfy)
+import Parsing.Token (digit, hexDigit)
 
 -- | An error type used when a custom component parser fails to handle a value.
 newtype URIPartParseError = URIPartParseError String
diff --git a/src/URI/Extra/MultiHostPortPair.purs b/src/URI/Extra/MultiHostPortPair.purs
@@ -15,9 +15,9 @@ import Data.String as String
 import Data.String.NonEmpty.CodeUnits (singleton) as NES
 import Data.String.NonEmpty (join1With) as NES
 import Data.These (These(..))
-import Text.Parsing.Parser (Parser, fail)
-import Text.Parsing.Parser.Combinators (optionMaybe, sepBy, try)
-import Text.Parsing.Parser.String (char, oneOf)
+import Parsing (Parser, fail)
+import Parsing.Combinators (optionMaybe, sepBy, try)
+import Parsing.String (char, oneOf)
 import URI.Common (URIPartParseError, unreserved, pctEncoded, wrapParser)
 import URI.Host (Host(..), RegName)
 import URI.Host.IPv4Address as IPv4Address
diff --git a/src/URI/Extra/QueryPairs.purs b/src/URI/Extra/QueryPairs.purs
@@ -33,9 +33,9 @@ import Data.Traversable (traverse)
 import Data.Tuple (Tuple(..))
 import JSURI (decodeURIComponent)
 import Partial.Unsafe (unsafePartial)
-import Text.Parsing.Parser (ParseError(..), Parser, runParser)
-import Text.Parsing.Parser.Combinators (optionMaybe, sepBy)
-import Text.Parsing.Parser.String (char, oneOf)
+import Parsing (ParseError(..), Parser, runParser)
+import Parsing.Combinators (optionMaybe, sepBy)
+import Parsing.String (char, oneOf)
 import URI.Common (URIPartParseError(..), unreserved, pctEncoded, printEncoded, wrapParser)
 import URI.Query as Q
 
diff --git a/src/URI/Extra/UserPassInfo.purs b/src/URI/Extra/UserPassInfo.purs
@@ -14,7 +14,7 @@ import Data.Newtype (class Newtype)
 import Data.String as String
 import Data.String.NonEmpty (NonEmptyString)
 import Data.String.NonEmpty.CodeUnits (singleton, splitAt, indexOf, drop) as NES
-import Text.Parsing.Parser (Parser)
+import Parsing (Parser)
 import URI.Common (URIPartParseError(..), decodeURIComponent', subDelims, unreserved, printEncoded')
 import URI.UserInfo (UserInfo)
 import URI.UserInfo as UserInfo
diff --git a/src/URI/Fragment.purs b/src/URI/Fragment.purs
@@ -18,8 +18,8 @@ import Data.String.NonEmpty (joinWith) as NES
 import Data.String.NonEmpty.CodeUnits (singleton) as NES
 import JSURI (decodeURIComponent)
 import Partial.Unsafe (unsafePartial)
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.String (char)
+import Parsing (Parser)
+import Parsing.String (char)
 import URI.Common (subDelims, unreserved, pctEncoded, printEncoded)
 
 -- | The fragment component (hash) of a URI.
diff --git a/src/URI/HierarchicalPart.purs b/src/URI/HierarchicalPart.purs
@@ -23,7 +23,7 @@ import Data.Generic.Rep (class Generic)
 import Data.Lens (Traversal', wander)
 import Data.Maybe (Maybe(..), maybe)
 import Data.Show.Generic (genericShow)
-import Text.Parsing.Parser (Parser)
+import Parsing (Parser)
 import URI.Authority (Authority(..), AuthorityOptions, AuthorityParseOptions, AuthorityPrintOptions, Host(..), IPv4Address, IPv6Address, Port, RegName, UserInfo, _IPv4Address, _IPv6Address, _NameAddress, _hosts, _userInfo)
 import URI.Authority as Authority
 import URI.Common (URIPartParseError, wrapParser)
diff --git a/src/URI/Host.purs b/src/URI/Host.purs
@@ -17,8 +17,8 @@ import Data.Generic.Rep (class Generic)
 import Data.Lens (Prism', prism')
 import Data.Maybe (Maybe(..))
 import Data.Show.Generic (genericShow)
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.Combinators (try)
+import Parsing (Parser)
+import Parsing.Combinators (try)
 import URI.Host.IPv4Address (IPv4Address)
 import URI.Host.IPv4Address as IPv4Address
 import URI.Host.IPv6Address (IPv6Address)
diff --git a/src/URI/Host/IPv4Address.purs b/src/URI/Host/IPv4Address.purs
@@ -14,10 +14,10 @@ import Data.Int as Int
 import Data.Maybe (Maybe(..))
 import Data.String.CodeUnits as String
 import Partial.Unsafe (unsafeCrashWith)
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.Combinators (try)
-import Text.Parsing.Parser.String (char, satisfy)
-import Text.Parsing.Parser.Token (digit)
+import Parsing (Parser)
+import Parsing.Combinators (try)
+import Parsing.String (char, satisfy)
+import Parsing.Token (digit)
 import URI.Common (URIPartParseError(..), wrapParser)
 
 -- | The IPv4 address variation of the host part of a URI.
diff --git a/src/URI/Host/IPv6Address.purs b/src/URI/Host/IPv6Address.purs
@@ -11,10 +11,10 @@ import Control.Alt ((<|>))
 import Data.List as List
 import Data.String.NonEmpty as NES
 import Data.String.NonEmpty.CodeUnits as NESCU
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.Combinators ((<?>))
-import Text.Parsing.Parser.String (char)
-import Text.Parsing.Parser.Token (hexDigit)
+import Parsing (Parser)
+import Parsing.Combinators ((<?>))
+import Parsing.String (char)
+import Parsing.Token (hexDigit)
 
 -- | This type and parser are much too forgiving currently, allowing almost
 -- | anything through that looks vaguely IPv6ish.
@@ -36,7 +36,7 @@ parser :: Parser String IPv6Address
 parser =
   IPv6Address
     <$> (char '[' *> (NES.joinWith "" <$> List.someRec (NESCU.singleton <$> ipv6Char)) <* char ']')
-    <?> "IPv6 address"
+      <?> "IPv6 address"
   where
   ipv6Char :: Parser String Char
   ipv6Char = hexDigit <|> char ':' <|> char '.'
diff --git a/src/URI/Host/RegName.purs b/src/URI/Host/RegName.purs
@@ -16,7 +16,7 @@ import Data.Array.NonEmpty as NEA
 import Data.String.NonEmpty (NonEmptyString)
 import Data.String.NonEmpty.CodeUnits (singleton) as NES
 import Data.String.NonEmpty (join1With, toString) as NES
-import Text.Parsing.Parser (Parser)
+import Parsing (Parser)
 import URI.Common (decodeURIComponent', subDelims, unreserved, pctEncoded, printEncoded')
 
 -- | The reg-name variation of the host part of a URI. A reg-name is probably
diff --git a/src/URI/HostPortPair.purs b/src/URI/HostPortPair.purs
@@ -5,8 +5,8 @@ import Prelude
 import Data.Either (Either)
 import Data.Maybe (Maybe(..))
 import Data.These (These(..))
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.Combinators (optionMaybe)
+import Parsing (Parser)
+import Parsing.Combinators (optionMaybe)
 import URI.Common (URIPartParseError, wrapParser)
 import URI.Host (Host)
 import URI.Host as Host
diff --git a/src/URI/Path.purs b/src/URI/Path.purs
@@ -7,8 +7,8 @@ import Data.Generic.Rep (class Generic)
 import Data.List as List
 import Data.Show.Generic (genericShow)
 import Data.String as String
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.String (char)
+import Parsing (Parser)
+import Parsing.String (char)
 import URI.Path.Segment (PathSegment, parseSegment, unsafeSegmentToString)
 
 -- | A generic absolute-or-empty path, used in both hierarchical-part and
diff --git a/src/URI/Path/Absolute.purs b/src/URI/Path/Absolute.purs
@@ -9,9 +9,9 @@ import Data.Maybe (Maybe(..))
 import Data.Show.Generic (genericShow)
 import Data.String as String
 import Data.Tuple (Tuple(..))
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.Combinators (optionMaybe)
-import Text.Parsing.Parser.String (char)
+import Parsing (Parser)
+import Parsing.Combinators (optionMaybe)
+import Parsing.String (char)
 import URI.Path.Segment (PathSegment, PathSegmentNZ, parseSegment, parseSegmentNZ, printSegmentNZ, printSegment)
 
 -- | An absolute path, corresponding to _path-absolute_ in the spec. This path
diff --git a/src/URI/Path/NoScheme.purs b/src/URI/Path/NoScheme.purs
@@ -8,8 +8,8 @@ import Data.List as List
 import Data.Show.Generic (genericShow)
 import Data.String as String
 import Data.Tuple (Tuple(..))
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.String (char)
+import Parsing (Parser)
+import Parsing.String (char)
 import URI.Path.Segment (PathSegment, PathSegmentNZNC, parseSegment, parseSegmentNZNC, printSegmentNZNC, printSegment)
 
 -- | A relative path that doesn't look like a URI scheme, corresponding to
diff --git a/src/URI/Path/Rootless.purs b/src/URI/Path/Rootless.purs
@@ -8,8 +8,8 @@ import Data.List as List
 import Data.Show.Generic (genericShow)
 import Data.String as String
 import Data.Tuple (Tuple(..))
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.String (char)
+import Parsing (Parser)
+import Parsing.String (char)
 import URI.Path.Segment (PathSegment, PathSegmentNZ, parseSegment, parseSegmentNZ, printSegmentNZ, printSegment)
 
 -- | A relative path, corresponding to _path-rootless_ in the spec. This path
diff --git a/src/URI/Path/Segment.purs b/src/URI/Path/Segment.purs
@@ -35,8 +35,8 @@ import Data.String.NonEmpty (join1With, joinWith, toString) as NES
 import Data.String.NonEmpty.CodeUnits (singleton) as NES
 import JSURI (decodeURIComponent)
 import Partial.Unsafe (unsafePartial)
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.String (char)
+import Parsing (Parser)
+import Parsing.String (char)
 import URI.Common (decodeURIComponent', pctEncoded, printEncoded, printEncoded', subDelims, unreserved)
 
 -- | A path segment. Can be empty, as this is required to represent some paths -
diff --git a/src/URI/Port.purs b/src/URI/Port.purs
@@ -15,9 +15,9 @@ import Data.Maybe (Maybe(..))
 import Data.String.NonEmpty (joinWith) as NES
 import Data.String.NonEmpty.CodeUnits (singleton) as NES
 import Partial.Unsafe (unsafeCrashWith)
-import Text.Parsing.Parser (Parser, fail)
-import Text.Parsing.Parser.String (char)
-import Text.Parsing.Parser.Token (digit)
+import Parsing (Parser, fail)
+import Parsing.String (char)
+import Parsing.Token (digit)
 
 -- | The port component of a host in a URI.
 newtype Port = Port Int
diff --git a/src/URI/Query.purs b/src/URI/Query.purs
@@ -18,8 +18,8 @@ import Data.String.NonEmpty (joinWith) as NES
 import Data.String.NonEmpty.CodeUnits (singleton) as NES
 import JSURI (decodeURIComponent)
 import Partial.Unsafe (unsafePartial)
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.String (char)
+import Parsing (Parser)
+import Parsing.String (char)
 import URI.Common (subDelims, unreserved, pctEncoded, printEncoded)
 
 -- | The query component of a URI.
diff --git a/src/URI/RelativePart.purs b/src/URI/RelativePart.purs
@@ -23,7 +23,7 @@ import Data.Generic.Rep (class Generic)
 import Data.Lens (Traversal', wander)
 import Data.Maybe (Maybe(..), maybe)
 import Data.Show.Generic (genericShow)
-import Text.Parsing.Parser (Parser)
+import Parsing (Parser)
 import URI.Authority (Authority(..), AuthorityOptions, AuthorityParseOptions, AuthorityPrintOptions, Host(..), IPv4Address, IPv6Address, Port, RegName, UserInfo, _IPv4Address, _IPv6Address, _NameAddress, _hosts, _userInfo)
 import URI.Authority as Authority
 import URI.Common (URIPartParseError, wrapParser)
diff --git a/src/URI/RelativeRef.purs b/src/URI/RelativeRef.purs
@@ -22,9 +22,9 @@ import Data.Lens (Lens', lens)
 import Data.Maybe (Maybe(..))
 import Data.Show.Generic (genericShow)
 import Data.String as String
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.Combinators (optionMaybe)
-import Text.Parsing.Parser.String (eof)
+import Parsing (Parser)
+import Parsing.Combinators (optionMaybe)
+import Parsing.String (eof)
 import URI.Common (URIPartParseError, wrapParser)
 import URI.Fragment (Fragment)
 import URI.Fragment as Fragment
diff --git a/src/URI/Scheme.purs b/src/URI/Scheme.purs
@@ -17,8 +17,8 @@ import Data.String.NonEmpty (NonEmptyString)
 import Data.String.NonEmpty (appendString, joinWith, toString) as NES
 import Data.String.NonEmpty.CodeUnits (singleton) as NES
 import Partial.Unsafe (unsafeCrashWith)
-import Text.Parsing.Parser (Parser, runParser)
-import Text.Parsing.Parser.String (char, eof)
+import Parsing (Parser, runParser)
+import Parsing.String (char, eof)
 import URI.Common (alpha, alphaNum)
 
 -- | The scheme part of an absolute URI. For example: `http`, `ftp`, `git`.
diff --git a/src/URI/URI.purs b/src/URI/URI.purs
@@ -23,9 +23,9 @@ import Data.Lens (Lens', lens)
 import Data.Maybe (Maybe(..))
 import Data.Show.Generic (genericShow)
 import Data.String as String
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.Combinators (optionMaybe)
-import Text.Parsing.Parser.String (eof)
+import Parsing (Parser)
+import Parsing.Combinators (optionMaybe)
+import Parsing.String (eof)
 import URI.Common (URIPartParseError, wrapParser)
 import URI.Fragment (Fragment)
 import URI.Fragment as Fragment
diff --git a/src/URI/URIRef.purs b/src/URI/URIRef.purs
@@ -24,8 +24,8 @@ import Prelude
 
 import Control.Alt ((<|>))
 import Data.Either (Either(..), either)
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.Combinators (try)
+import Parsing (Parser)
+import Parsing.Combinators (try)
 import URI.Authority (Authority(..))
 import URI.Common (URIPartParseError)
 import URI.Fragment (Fragment)
diff --git a/src/URI/UserInfo.purs b/src/URI/UserInfo.purs
@@ -16,8 +16,8 @@ import Data.Array.NonEmpty as NEA
 import Data.String.NonEmpty (NonEmptyString)
 import Data.String.NonEmpty.CodeUnits (singleton) as NES
 import Data.String.NonEmpty (join1With, toString) as NES
-import Text.Parsing.Parser (Parser)
-import Text.Parsing.Parser.String (char)
+import Parsing (Parser)
+import Parsing.String (char)
 import URI.Common (decodeURIComponent', subDelims, unreserved, pctEncoded, printEncoded')
 
 -- | The user info part of an `Authority`. For example: `user`, `foo:bar`.
diff --git a/test/URI/Host.purs b/test/URI/Host.purs
@@ -8,7 +8,7 @@ import Type.Proxy (Proxy(..))
 import Test.QuickCheck ((===))
 import Test.Spec (Spec, describe, it, shouldEqual)
 import Test.Util (forAll, testIso)
-import Text.Parsing.Parser (runParser)
+import Parsing (runParser)
 import URI.Host (Host(..))
 import URI.Host as Host
 import URI.Host.Gen as Host.Gen
diff --git a/test/Util.purs b/test/Util.purs
@@ -7,7 +7,7 @@ import Effect.Class (liftEffect)
 import Test.QuickCheck as QC
 import Test.QuickCheck.Gen as QCG
 import Test.Spec (Spec, it, fail)
-import Text.Parsing.Parser (Parser, runParser)
+import Parsing (Parser, runParser)
 
 testPrinter :: forall a. Show a => (a -> String) -> String -> a -> Spec Unit
 testPrinter f expected value =
