diff --git a/src/bench/bench.scala b/src/bench/bench.scala index 400640a..f2e12cf 100644 --- a/src/bench/bench.scala +++ b/src/bench/bench.scala @@ -17,17 +17,16 @@ jawn, version [unreleased]. Copyright 2024 Jon Pretty, Propensive OÜ. package merino -import probably.* -import gossamer.* -//import galilei.*, filesystems.unix +import ambience.*, environments.system import anticipation.* //, filesystemInterfaces.galileiApi import eucalyptus.* -import rudiments.* +import gossamer.* import hieroglyph.*, characterEncodings.utf8, badEncodingHandlers.strict import parasite.*, monitors.global +import probably.* +import rudiments.* import turbulence.*, stdioSources.virtualMachine import unsafeExceptions.canThrowAny -import ambience.*, environments.system import LogFormat.standardAnsi diff --git a/src/core/merino.JsonAst.scala b/src/core/merino.JsonAst.scala index 0ea8cc6..6f539c8 100644 --- a/src/core/merino.JsonAst.scala +++ b/src/core/merino.JsonAst.scala @@ -18,13 +18,13 @@ jawn, version [unreleased]. Copyright 2024 Jon Pretty, Propensive OÜ. package merino import annotation.* -import rudiments.* -import contingency.* import anticipation.* +import contingency.* import prepositional.* +import rudiments.* +import scala.collection.mutable.ArrayBuffer import turbulence.* import vacuous.* -import scala.collection.mutable.ArrayBuffer import JsonAst.AsciiByte.* import JsonParseError.Reason diff --git a/src/core/merino.JsonParseError.scala b/src/core/merino.JsonParseError.scala index d4dcbf4..440d0f8 100644 --- a/src/core/merino.JsonParseError.scala +++ b/src/core/merino.JsonParseError.scala @@ -17,7 +17,8 @@ jawn, version [unreleased]. Copyright 2024 Jon Pretty, Propensive OÜ. package merino -import annotation.* +import scala.annotation.* + import anticipation.* import fulminate.* diff --git a/src/test/tests.scala b/src/test/tests.scala index 961e6ec..62e451c 100644 --- a/src/test/tests.scala +++ b/src/test/tests.scala @@ -17,15 +17,15 @@ jawn, version [unreleased]. Copyright 2024 Jon Pretty, Propensive OÜ. package merino -import probably.* -import gossamer.* +import ambience.*, systemProperties.virtualMachine import anticipation.*, filesystemInterfaces.javaIo -import eucalyptus.* -import rudiments.*, workingDirectories.virtualMachine import contingency.*, strategies.throwUnsafely +import eucalyptus.* +import gossamer.* import hieroglyph.*, charEncoders.utf8 +import probably.* +import rudiments.*, workingDirectories.virtualMachine import turbulence.* -import ambience.*, systemProperties.virtualMachine import java.io as ji