From b6a85b51d8f16ee1178d34ee0c5afc787019ee35 Mon Sep 17 00:00:00 2001
From: Chris de Vreeze <chris.de.vreeze@caiway.net>
Date: Sat, 1 Apr 2023 19:02:42 +0200
Subject: [PATCH] Changed import (wildcard) syntax, removed package objects,
 etc.

---
 build.sbt                                                     | 2 +-
 .../xpathparser/parse/ParseW3cXPathExpressionsTest.scala      | 2 +-
 .../src/main/scala/eu/cdevreeze/xpathparser/ast/package.scala | 2 +-
 .../main/scala/eu/cdevreeze/xpathparser/common/package.scala  | 2 +-
 .../eu/cdevreeze/xpathparser/parse/DelimitingTerminals.scala  | 4 ++--
 .../eu/cdevreeze/xpathparser/parse/XPathElemParser.scala      | 4 ++--
 .../scala/eu/cdevreeze/xpathparser/parse/XPathParser.scala    | 2 +-
 .../main/scala/eu/cdevreeze/xpathparser/parse/package.scala   | 2 +-
 .../scala/eu/cdevreeze/xpathparser/queryapi/ElemApi.scala     | 2 +-
 .../scala/eu/cdevreeze/xpathparser/queryapi/ElemLike.scala    | 2 +-
 .../scala/eu/cdevreeze/xpathparser/queryapi/package.scala     | 2 +-
 .../main/scala/eu/cdevreeze/xpathparser/util/package.scala    | 2 +-
 .../scala/eu/cdevreeze/xpathparser/parse/ParseXPathTest.scala | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/build.sbt b/build.sbt
index e09c095..97444fa 100644
--- a/build.sbt
+++ b/build.sbt
@@ -20,7 +20,7 @@ ThisBuild / crossScalaVersions := crossScalaVer
 
 ThisBuild / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
   case (Some((3, _))) =>
-    Seq("-unchecked", "-deprecation", "-Xfatal-warnings")
+    Seq("-unchecked", "-deprecation", "-feature", "-Xfatal-warnings")
   case _ =>
     Seq("-Wconf:cat=unused-imports:w,cat=unchecked:w,cat=deprecation:w,cat=feature:w,cat=lint:w", "-Ytasty-reader", "-Xsource:3")
 })
diff --git a/jvm/src/test/scala/eu/cdevreeze/xpathparser/parse/ParseW3cXPathExpressionsTest.scala b/jvm/src/test/scala/eu/cdevreeze/xpathparser/parse/ParseW3cXPathExpressionsTest.scala
index 7f96ab6..030a158 100644
--- a/jvm/src/test/scala/eu/cdevreeze/xpathparser/parse/ParseW3cXPathExpressionsTest.scala
+++ b/jvm/src/test/scala/eu/cdevreeze/xpathparser/parse/ParseW3cXPathExpressionsTest.scala
@@ -17,7 +17,7 @@
 package eu.cdevreeze.xpathparser.parse
 
 import scala.collection.mutable
-import scala.jdk.CollectionConverters._
+import scala.jdk.CollectionConverters.*
 
 import cats.parse.{Parser => P}
 import eu.cdevreeze.xpathparser.ast.XPathExpr
diff --git a/shared/src/main/scala/eu/cdevreeze/xpathparser/ast/package.scala b/shared/src/main/scala/eu/cdevreeze/xpathparser/ast/package.scala
index 0b3f4e6..865261c 100644
--- a/shared/src/main/scala/eu/cdevreeze/xpathparser/ast/package.scala
+++ b/shared/src/main/scala/eu/cdevreeze/xpathparser/ast/package.scala
@@ -22,4 +22,4 @@ package eu.cdevreeze.xpathparser
  * @author
  *   Chris de Vreeze
  */
-package object ast
+package ast
diff --git a/shared/src/main/scala/eu/cdevreeze/xpathparser/common/package.scala b/shared/src/main/scala/eu/cdevreeze/xpathparser/common/package.scala
index e7005ed..830fa1d 100644
--- a/shared/src/main/scala/eu/cdevreeze/xpathparser/common/package.scala
+++ b/shared/src/main/scala/eu/cdevreeze/xpathparser/common/package.scala
@@ -23,4 +23,4 @@ package eu.cdevreeze.xpathparser
  * @author
  *   Chris de Vreeze
  */
-package object common
+package common
diff --git a/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/DelimitingTerminals.scala b/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/DelimitingTerminals.scala
index ef91cbc..f9b79a8 100644
--- a/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/DelimitingTerminals.scala
+++ b/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/DelimitingTerminals.scala
@@ -18,10 +18,10 @@ package eu.cdevreeze.xpathparser.parse
 
 import eu.cdevreeze.xpathparser.ast.BracedUriLiteral
 import eu.cdevreeze.xpathparser.ast.StringLiteral
-import cats.parse.Accumulator0._
+import cats.parse.Accumulator0.*
 import cats.parse.{Parser => P}
 
-import scala.util.chaining._
+import scala.util.chaining.*
 
 /**
  * Delimiting terminal symbols. No whitespace is skipped during this tokenization. Lookahead is applied when needed to
diff --git a/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/XPathElemParser.scala b/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/XPathElemParser.scala
index bc3031c..2002700 100644
--- a/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/XPathElemParser.scala
+++ b/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/XPathElemParser.scala
@@ -17,7 +17,7 @@
 package eu.cdevreeze.xpathparser.parse
 
 import cats.data.NonEmptyVector
-import eu.cdevreeze.xpathparser.ast._
+import eu.cdevreeze.xpathparser.ast.*
 import cats.parse.{Parser => P}
 
 /**
@@ -44,7 +44,7 @@ object XPathElemParser:
   // TODO Improve, improve, improve. Study XPath spec more closely, use cats-parse in a better way.
   // TODO Also make code complete and more robust, (slightly) improve the AST class hierarchy, etc.
 
-  import Whitespace._
+  import Whitespace.*
 
   private val DT = DelimitingTerminals
   private val NDT = NonDelimitingTerminals
diff --git a/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/XPathParser.scala b/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/XPathParser.scala
index 0a043cd..0d5ed8e 100644
--- a/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/XPathParser.scala
+++ b/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/XPathParser.scala
@@ -32,7 +32,7 @@ import cats.parse.{Parser => P}
  */
 object XPathParser:
 
-  import Whitespace._
+  import Whitespace.*
 
   /**
    * Parser for an XPath expression. Usage: `xpathExpr.parse(xpathString)`. Comments are not supported, so will lead to
diff --git a/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/package.scala b/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/package.scala
index 5b792a6..41f0c67 100644
--- a/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/package.scala
+++ b/shared/src/main/scala/eu/cdevreeze/xpathparser/parse/package.scala
@@ -22,4 +22,4 @@ package eu.cdevreeze.xpathparser
  * @author
  *   Chris de Vreeze
  */
-package object parse
+package parse
diff --git a/shared/src/main/scala/eu/cdevreeze/xpathparser/queryapi/ElemApi.scala b/shared/src/main/scala/eu/cdevreeze/xpathparser/queryapi/ElemApi.scala
index c73686d..aae239e 100644
--- a/shared/src/main/scala/eu/cdevreeze/xpathparser/queryapi/ElemApi.scala
+++ b/shared/src/main/scala/eu/cdevreeze/xpathparser/queryapi/ElemApi.scala
@@ -154,4 +154,4 @@ object ElemApi:
   /**
    * Element predicate that returns true for each element.
    */
-  val anyElem: ElemApi[_] => Boolean = { _ => true }
+  val anyElem: ElemApi[?] => Boolean = { _ => true }
diff --git a/shared/src/main/scala/eu/cdevreeze/xpathparser/queryapi/ElemLike.scala b/shared/src/main/scala/eu/cdevreeze/xpathparser/queryapi/ElemLike.scala
index 7405e69..811b933 100644
--- a/shared/src/main/scala/eu/cdevreeze/xpathparser/queryapi/ElemLike.scala
+++ b/shared/src/main/scala/eu/cdevreeze/xpathparser/queryapi/ElemLike.scala
@@ -24,7 +24,7 @@ import scala.reflect.ClassTag
  * @author
  *   Chris de Vreeze
  */
-trait ElemLike[E <: ElemLike[E]] extends ElemApi[E] { self: E =>
+transparent trait ElemLike[E <: ElemLike[E]] extends ElemApi[E] { self: E =>
 
   import ElemApi.anyElem
 
diff --git a/shared/src/main/scala/eu/cdevreeze/xpathparser/queryapi/package.scala b/shared/src/main/scala/eu/cdevreeze/xpathparser/queryapi/package.scala
index 8c4094f..f214da8 100644
--- a/shared/src/main/scala/eu/cdevreeze/xpathparser/queryapi/package.scala
+++ b/shared/src/main/scala/eu/cdevreeze/xpathparser/queryapi/package.scala
@@ -27,4 +27,4 @@ package eu.cdevreeze.xpathparser
  * @author
  *   Chris de Vreeze
  */
-package object queryapi
+package queryapi
diff --git a/shared/src/main/scala/eu/cdevreeze/xpathparser/util/package.scala b/shared/src/main/scala/eu/cdevreeze/xpathparser/util/package.scala
index e788148..0c293b0 100644
--- a/shared/src/main/scala/eu/cdevreeze/xpathparser/util/package.scala
+++ b/shared/src/main/scala/eu/cdevreeze/xpathparser/util/package.scala
@@ -22,4 +22,4 @@ package eu.cdevreeze.xpathparser
  * @author
  *   Chris de Vreeze
  */
-package object util
+package util
diff --git a/shared/src/test/scala/eu/cdevreeze/xpathparser/parse/ParseXPathTest.scala b/shared/src/test/scala/eu/cdevreeze/xpathparser/parse/ParseXPathTest.scala
index 657a711..23f7389 100644
--- a/shared/src/test/scala/eu/cdevreeze/xpathparser/parse/ParseXPathTest.scala
+++ b/shared/src/test/scala/eu/cdevreeze/xpathparser/parse/ParseXPathTest.scala
@@ -84,7 +84,7 @@ class ParseXPathTest extends AnyFunSuite:
 
   import cats.parse.{Parser => P}
 
-  import XPathElemParser._
+  import XPathElemParser.*
   import XPathParser.xpathExpr
 
   private def throwParseError(exprString: String): Nothing = sys.error(s"Could not parse expression: $exprString")