Use context function for Env in scalaJVM

avdv · Jun 11, 2024 · 00e782a · 00e782a
1 parent 94477d2
commit 00e782a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/jvm/src/main/scala/de/bley/scalals/package.scala b/jvm/src/main/scala/de/bley/scalals/package.scala
@@ -3,8 +3,5 @@ package de.bley
 package scalals:
   sealed trait Env
 
-package object scalals:
-  object EmptyEnv extends Env
-
-  @inline
-  def Env[T](f: Env => T) = f(EmptyEnv)
+  object Env extends Env:
+    inline def apply[T](inline f: Env ?=> T): T = f(using this)
diff --git a/native/src/main/scala/de/bley/scalals/Core.scala b/native/src/main/scala/de/bley/scalals/Core.scala
@@ -19,7 +19,7 @@ object FileInfo:
   // FIXME: crashes with a scala.scalanative.runtime.UndefinedBehaviorError
   // val lookupService = FileSystems.getDefault.getUserPrincipalLookupService
 
-  def apply(path: Path, dereference: Boolean)(implicit z: Env) =
+  def apply(path: Path, dereference: Boolean)(using e: Env) =
     val info =
       val buf = alloc[stat.stat]()
       val err =