fixed warning and imports

j-mie6 · Sep 18, 2023 · 256755f · 256755f
1 parent 9ce1d82
commit 256755f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/parsley-cats/shared/src/main/scala/parsley/cats/combinator.scala b/parsley-cats/shared/src/main/scala/parsley/cats/combinator.scala
@@ -11,8 +11,6 @@ import parsley.Parsley, Parsley.notFollowedBy
 import parsley.combinator.{many, manyUntil}
 import parsley.lift.lift2
 
-import org.typelevel.scalaccompat.annotation._
-
 /** This module contains pre-made combinators that are very useful for a variety of purposes, specialised to `cats`.
   *
   * In particular, it contains functionality found normally in `parsley.combinator`, but returning the `cats` `NonEmptyList`
@@ -131,7 +129,7 @@ object combinator {
       * @since 1.2.0
       */
     def sepEndBy1[A](p: Parsley[A], sep: =>Parsley[_]): Parsley[NonEmptyList[A]] = parsley.combinator.sepEndBy1(p, sep).map { xxs =>
-        val (x::xs) = xxs: @nowarn
+        val (x::xs) = xxs: @unchecked
         NonEmptyList(x, xs)
     }
 

diff --git a/parsley-cats/shared/src/main/scala/parsley/token/cats.scala b/parsley-cats/shared/src/main/scala/parsley/token/cats.scala
@@ -6,15 +6,15 @@
 package parsley.token
 
 import parsley.Parsley
+import parsley.cats.combinator.sepBy1
+
 import _root_.cats.data.NonEmptyList
-import parsley.cats.combinator._
 
 object cats {
     implicit class LexerNonEmpty(val lexer: Lexer) {
         object cats {
             object lexeme {
                 object separators {
-                    import lexer.lexeme.symbol
                     /**  This combinator parses '''one''' or more occurrences of `p`, separated by semi-colons.
                      *
                      * First parses a `p`. Then parses a semi-colon followed by `p` until there are no more  semi-colons.
@@ -39,7 +39,7 @@ object cats {
                      * @return a parser that parses `p` delimited by semi-colons, returning the list of `p`'s results.
                      * @since 1.3.0
                      */
-                    def semiSep1[A](p: Parsley[A]): Parsley[NonEmptyList[A]] = sepBy1(p, symbol.semi)
+                    def semiSep1[A](p: Parsley[A]): Parsley[NonEmptyList[A]] = sepBy1(p, lexer.lexeme.symbol.semi)
                     /**  This combinator parses '''one''' or more occurrences of `p`, separated by commas.
                      *
                      * First parses a `p`. Then parses a comma followed by `p` until there are no more  commas.
@@ -64,7 +64,7 @@ object cats {
                      * @return a parser that parses `p` delimited by commas, returning the list of `p`'s results.
                      * @since 1.3.0
                      */
-                    def commaSep1[A](p: Parsley[A]): Parsley[NonEmptyList[A]] = sepBy1(p, symbol.comma)
+                    def commaSep1[A](p: Parsley[A]): Parsley[NonEmptyList[A]] = sepBy1(p, lexer.lexeme.symbol.comma)
                 }
             }
         }