From cfc6ee7bc4952b0381644c4527726be89e542f7c Mon Sep 17 00:00:00 2001 From: Daniel Slapman Date: Sat, 18 Jan 2025 21:07:59 +0100 Subject: [PATCH 1/2] Make `derived` def instead of given --- oolong-bson/src/main/scala/oolong/bson/BsonDecoder.scala | 2 +- oolong-bson/src/main/scala/oolong/bson/BsonEncoder.scala | 2 +- oolong-bson/src/test/scala/oolong/bson/meta/QueryMetaSpec.scala | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/oolong-bson/src/main/scala/oolong/bson/BsonDecoder.scala b/oolong-bson/src/main/scala/oolong/bson/BsonDecoder.scala index f33802d..88020cd 100644 --- a/oolong-bson/src/main/scala/oolong/bson/BsonDecoder.scala +++ b/oolong-bson/src/main/scala/oolong/bson/BsonDecoder.scala @@ -164,7 +164,7 @@ object BsonDecoder { } } - inline given derived[T]: BsonDecoder[T] = ${ derivedImpl[T] } + inline def derived[T]: BsonDecoder[T] = ${ derivedImpl[T] } def derivedImpl[T: Type](using q: Quotes): Expr[BsonDecoder[T]] = import quotes.reflect.* diff --git a/oolong-bson/src/main/scala/oolong/bson/BsonEncoder.scala b/oolong-bson/src/main/scala/oolong/bson/BsonEncoder.scala index d7de4b0..d373a87 100644 --- a/oolong-bson/src/main/scala/oolong/bson/BsonEncoder.scala +++ b/oolong-bson/src/main/scala/oolong/bson/BsonEncoder.scala @@ -111,7 +111,7 @@ object BsonEncoder { } } - inline given derived[T]: BsonEncoder[T] = ${ derivedImpl[T] } + inline def derived[T]: BsonEncoder[T] = ${ derivedImpl[T] } def derivedImpl[T: Type](using q: Quotes): Expr[BsonEncoder[T]] = import quotes.reflect.* diff --git a/oolong-bson/src/test/scala/oolong/bson/meta/QueryMetaSpec.scala b/oolong-bson/src/test/scala/oolong/bson/meta/QueryMetaSpec.scala index d250e54..75c5e8f 100644 --- a/oolong-bson/src/test/scala/oolong/bson/meta/QueryMetaSpec.scala +++ b/oolong-bson/src/test/scala/oolong/bson/meta/QueryMetaSpec.scala @@ -2,7 +2,6 @@ package oolong.bson.meta import java.time.Instant import scala.annotation.nowarn -import scala.util.Random import oolong.bson.meta.* import oolong.bson.meta.queryMeta From 976bdebdb830b430fee6020b689f72d609c4ccec Mon Sep 17 00:00:00 2001 From: Daniel Slapman Date: Sat, 18 Jan 2025 21:10:54 +0100 Subject: [PATCH 2/2] Remove unused imports --- oolong-bson/src/main/scala/oolong/bson/BsonDecoder.scala | 1 - oolong-bson/src/main/scala/oolong/bson/defaultdec.scala | 1 - 2 files changed, 2 deletions(-) diff --git a/oolong-bson/src/main/scala/oolong/bson/BsonDecoder.scala b/oolong-bson/src/main/scala/oolong/bson/BsonDecoder.scala index 88020cd..71692f7 100644 --- a/oolong-bson/src/main/scala/oolong/bson/BsonDecoder.scala +++ b/oolong-bson/src/main/scala/oolong/bson/BsonDecoder.scala @@ -3,7 +3,6 @@ package oolong.bson import scala.util.* import scala.util.Try -import magnolia1.* import oolong.bson.annotation.* import oolong.bson.meta.QueryMeta import org.bson.BsonNull diff --git a/oolong-bson/src/main/scala/oolong/bson/defaultdec.scala b/oolong-bson/src/main/scala/oolong/bson/defaultdec.scala index 7a4dab5..928fd8d 100644 --- a/oolong-bson/src/main/scala/oolong/bson/defaultdec.scala +++ b/oolong-bson/src/main/scala/oolong/bson/defaultdec.scala @@ -10,7 +10,6 @@ import java.util.UUID import scala.collection.immutable import scala.collection.immutable.Map import scala.collection.mutable -import scala.collection.mutable.Builder import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration import scala.jdk.CollectionConverters.*