Configure _assert so that it doesn't affect Predef.assert

This way it works the same in Scala 3 and 2.13.
durban · Jan 3, 2025 · 6a0c5f8 · 6a0c5f8
1 parent 93f7c4f
commit 6a0c5f8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 32 deletions.
diff --git a/build.sbt b/build.sbt
@@ -729,7 +729,7 @@ lazy val commonSettings = Seq[Setting[_]](
         "-Xsource:3-cross",
         "-Wnonunit-statement",
         "-Wvalue-discard",
-      ) ++ (if (assertionsEnabled.value) Nil else List("-Xelide-below", "2001"))
+      ) ++ (if (assertionsEnabled.value) Nil else List("-Xelide-below", "1501"))
     } else {
       // 3.x:
       List(

diff --git a/internal-helpers/src/test/scala-2.13/dev/tauri/choam/helpers/ChoamUtils2.scala b/internal-helpers/src/test/scala-2.13/dev/tauri/choam/helpers/ChoamUtils2.scala
@@ -25,7 +25,7 @@ import scala.annotation.{ elidable, nowarn }
 @nowarn("msg=elidable")
 private[choam] abstract class ChoamUtils2 {
 
-  @elidable(elidable.ASSERTION)
+  @elidable(1500)
   private[choam] final def _assert(ok: Boolean): Unit = {
     if (!ok) {
       throw new AssertionError

diff --git a/...l-helpers/src/test/scala-2.13/dev/tauri/choam/helpers/DisableAssertionsSpecScala213.scala b/...l-helpers/src/test/scala-2.13/dev/tauri/choam/helpers/DisableAssertionsSpecScala213.scala
diff --git a/internal-helpers/src/test/scala/dev/tauri/choam/helpers/DisabledAssertionsSpec.scala b/internal-helpers/src/test/scala/dev/tauri/choam/helpers/DisabledAssertionsSpec.scala
@@ -25,15 +25,23 @@ final class DisableAssertionsSpec extends BaseSpec {
     _assert({ throw new Exception; false }) : @nowarn("cat=w-flag-dead-code")
   }
 
+  test("Predef.assert should still work".fail) {
+    Predef.assert(false)
+  }
+
+  test("Predef.assert should still work (with message)".fail) {
+    Predef.assert(false, "foo")
+  }
+
   test("munit assert should still work".fail) {
     this.assert(false)
   }
 
-  test("require(Boolean) should still work".fail) {
+  test("require should still work".fail) {
     require(false)
   }
 
-  test("require(Boolean, => Any) should still work".fail) {
+  test("require should still work (with message)".fail) {
     require(false, "foo")
   }
 

diff --git a/skiplist/shared/src/main/scala-2.13/dev/tauri/choam/internal/ChoamUtils.scala b/skiplist/shared/src/main/scala-2.13/dev/tauri/choam/internal/ChoamUtils.scala
@@ -24,7 +24,7 @@ import scala.annotation.{ elidable, nowarn }
 @nowarn("msg=elidable")
 private[choam] abstract class ChoamUtils {
 
-  @elidable(elidable.ASSERTION)
+  @elidable(1500)
   private[choam] final def _assert(ok: Boolean): Unit = {
     if (!ok) {
       throw new AssertionError