silence deprecation warnings, fix typos

sbt · May 10, 2022 · f7c4266 · f7c4266
1 parent b256c59
commit f7c4266
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/internal/compiler-bridge/src/main/scala/xsbt/ExtractAPI.scala b/internal/compiler-bridge/src/main/scala/xsbt/ExtractAPI.scala
@@ -139,7 +139,7 @@ class ExtractAPI[GlobalType <: Global](
 
     def leaveExistentialTypeVariables(typeVariables: Seq[Symbol]): Unit = {
       nestingLevel -= 1
-      assert(nestingLevel >= 0)
+      assert(nestingLevel >= 0, s"nestingLevel = $nestingLevel")
       typeVariables.foreach(renameTo.remove)
     }
     def enterExistentialTypeVariables(typeVariables: Seq[Symbol]): Unit = {
@@ -315,8 +315,8 @@ class ExtractAPI[GlobalType <: Global](
       }
       t match {
         case PolyType(typeParams0, base) =>
-          assert(typeParams.isEmpty)
-          assert(valueParameters.isEmpty)
+          assert(typeParams.isEmpty, typeParams.toString)
+          assert(valueParameters.isEmpty, valueParameters.toString)
           build(base, typeParameters(in, typeParams0), Nil)
         case MethodType(params, resultType) =>
           build(resultType, typeParams, parameterList(params) :: valueParameters)

diff --git a/internal/zinc-core/src/main/scala/sbt/internal/inc/Changes.scala b/internal/zinc-core/src/main/scala/sbt/internal/inc/Changes.scala
@@ -56,7 +56,7 @@ sealed abstract class APIChange(val modifiedClass: String) extends XAPIChange {
 }
 
 /**
- * If we recompile a source file that contains a macro definition then we always assume that it's
+ * If we recompile a source file that contains a macro definition then we always assume that its
  * api has changed. The reason is that there's no way to determine if changes to macros implementation
  * are affecting its users or not. Therefore we err on the side of caution.
  */

diff --git a/internal/zinc-core/src/main/scala/sbt/internal/inc/Incremental.scala b/internal/zinc-core/src/main/scala/sbt/internal/inc/Incremental.scala
@@ -208,7 +208,7 @@ object Incremental {
     } catch {
       case _: xsbti.CompileCancelled =>
         log.info("Compilation has been cancelled")
-        // in case compilation got cancelled potential partial compilation results (e.g. produced classs files) got rolled back
+        // in case compilation got cancelled potential partial compilation results (e.g. produced class files) got rolled back
         // and we can report back as there was no change (false) and return a previous Analysis which is still up-to-date
         (false, previous)
     } finally runProfiler.registerRun()
@@ -291,7 +291,7 @@ object Incremental {
     } catch {
       case _: xsbti.CompileCancelled =>
         log.info("Compilation has been cancelled")
-        // in case compilation got cancelled potential partial compilation results (e.g. produced classs files) got rolled back
+        // in case compilation got cancelled potential partial compilation results (e.g. produced class files) got rolled back
         // and we can report back as there was no change (false) and return a previous Analysis which is still up-to-date
         (false, previous)
     }