Fix Scala Native Example Code (#3899)

Pull request: #3899
com-lihaoyi · Nov 4, 2024 · 96c4057 · 96c4057
1 parent c1f4793
commit 96c4057
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/example/scalalib/native/1-simple/src/Foo.scala b/example/scalalib/native/1-simple/src/Foo.scala
@@ -6,17 +6,16 @@ import mainargs.{main, ParserForMethods}
 
 object Foo {
 
-  def generateHtml(text: String): CString = {
+  def generateHtml(text: String) (using Zone) = {
     val html = "<h1>" + text + "</h1>\n"
 
-    implicit val z: Zone = Zone.open()
     val cResult = toCString(html)
     cResult
 
   }
 
   @main
-  def main(text: String) = {
+  def main(text: String) = Zone {
     stdio.printf(generateHtml(text))
   }
 

diff --git a/example/scalalib/native/3-multi-module/bar/src/Bar.scala b/example/scalalib/native/3-multi-module/bar/src/Bar.scala
@@ -4,9 +4,8 @@ import scala.scalanative.libc._
 import scala.scalanative.unsafe._
 
 object Bar {
-  def main(args: Array[String]): Unit = {
+  def main(args: Array[String]): Unit = Zone {
     println("Running HelloWorld function")
-    implicit val z: Zone = Zone.open()
     val result = toCString(args(0))
     val barValue = HelloWorldBar.stringLength(result)
     stdio.printf(c"Bar value: Argument length is %i\n", barValue)

diff --git a/example/scalalib/native/3-multi-module/foo/src/Foo.scala b/example/scalalib/native/3-multi-module/foo/src/Foo.scala
@@ -7,9 +7,8 @@ import mainargs.{main, ParserForMethods, arg}
 object Foo {
   @main
   def main(@arg(name = "foo-text") fooText: String,
-           @arg(name = "bar-text") barText: String): Unit = {
+           @arg(name = "bar-text") barText: String): Unit = Zone {
 
-    implicit val z: Zone = Zone.open()
     val cFooText = toCString(fooText)
     val cBarText = toCString(barText)
 

diff --git a/example/scalalib/native/4-common-config/build.mill b/example/scalalib/native/4-common-config/build.mill
@@ -32,7 +32,7 @@ object `package` extends RootModule with ScalaNativeModule {
 
 > ./mill run
 ...
-Foo.value: <h1>hello</h1>
+Value: <h1>hello</h1>
 
 > ./mill show releaseMode
 "mill.scalanativelib.api.ReleaseMode.ReleaseFast"

diff --git a/example/scalalib/native/4-common-config/src/Foo.scala b/example/scalalib/native/4-common-config/src/Foo.scala
@@ -6,18 +6,16 @@ import fansi._
 
 object Foo {
 
-  def generateHtml(text: String): CString = {
+  def generateHtml(text: String) (using Zone) = {
     val colored = Console.RED + "<h1>" + text + "</h1>" + Console.RESET
 
-    implicit val z: Zone = Zone.open()
     val cResult = toCString(colored)
     cResult
   }
 
-  val value = generateHtml("hello")
-
-  def main(args: Array[String]): Unit = {
-    stdio.printf(c"Foo.value: %s\n", Foo.value)
+  def main(args: Array[String]): Unit = Zone {
+    val value = generateHtml("hello")
+    stdio.printf(c"Value: %s\n", value)
   }
 }