Skip to content

Commit 04f8905

Browse files
committed
Get rid of redundant end
1 parent 6b94e7b commit 04f8905

File tree

6 files changed

+1
-20
lines changed

6 files changed

+1
-20
lines changed

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@ case class Person(name: String, address: Option[Address]) derives BsonEncoder, B
365365

366366
object Person:
367367
inline given QueryMeta[Person] = queryMeta(_.name -> "lastName")
368-
end Person
369368

370369
case class Address(city: String) derives BsonEncoder, BsonDecoder
371370

@@ -411,7 +410,6 @@ case class Student(firstName: String, lastName: String, previousUniversity: Stri
411410

412411
object Student:
413412
inline given QueryMeta[Student] = QueryMeta.snakeCase.withRenaming(_.firstName -> "name")
414-
end Student
415413

416414
val s = Student("Alexander", "Bloom", "MSU")
417415
val bson = s.bson

oolong-bson/src/main/scala/oolong/bson/BsonDecoder.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ object BsonDecoder {
125125
}
126126
}
127127
}
128-
end toProduct
129128

130129
def toSum[T: Type](mirror: Expr[Mirror.SumOf[T]], elemInstances: List[Expr[BsonDecoder[_]]])(using
131130
q: Quotes
@@ -180,5 +179,4 @@ object BsonDecoder {
180179
case '{ $m: Mirror.SumOf[T] { type MirroredElemTypes = elementTypes } } =>
181180
val elemInstances = summonAllForSum[elementTypes]
182181
toSum[T](m, elemInstances)
183-
end derivedImpl
184182
}

oolong-bson/src/main/scala/oolong/bson/BsonEncoder.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ object BsonEncoder {
8383
}
8484
}
8585
}
86-
end productBody
8786

8887
def sumBody[T: Type](mirror: Expr[Mirror.SumOf[T]], elemInstances: List[Expr[BsonEncoder[_]]])(using
8988
q: Quotes
@@ -126,5 +125,4 @@ object BsonEncoder {
126125
case '{ $m: Mirror.SumOf[T] { type MirroredElemTypes = elementTypes } } =>
127126
val elemInstances = summonAllForSum[elementTypes]
128127
sumBody[T](m, elemInstances)
129-
end derivedImpl
130128
}

oolong-bson/src/main/scala/oolong/bson/annotation/BsonDiscriminator.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,4 @@ object BsonDiscriminator:
2828
report.error(s"Found more then one BsonDiscriminator annotation for ${tepr.typeSymbol.name}")
2929

3030
Expr.ofList(annotations.toSeq)
31-
}
32-
33-
end BsonDiscriminator
31+
}

oolong-bson/src/main/scala/oolong/bson/meta/QueryMeta.scala

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ extension [T](inline q: QueryMeta[T])
1212
withRenamingImpl('q, 'fields)
1313
}
1414

15-
end extension
16-
1715
object QueryMeta:
1816
given [T: Type]: FromExpr[QueryMeta[T]] = new FromExpr[QueryMeta[T]]:
1917
def unapply(expr: Expr[QueryMeta[T]])(using q: Quotes): Option[QueryMeta[T]] =
@@ -53,7 +51,6 @@ object QueryMeta:
5351
private def field2WordArray(name: String): Array[String] =
5452
val first = regexp1.matcher(name).replaceAll(replacement)
5553
regexp2.matcher(first).replaceAll(replacement).split("_")
56-
end field2WordArray
5754

5855
private def capitalize(word: String) =
5956
word.take(1).toUpperCase + word.tail
@@ -91,8 +88,6 @@ object QueryMeta:
9188
val resultMap = merge(caseSnakeMeta, childrenMeta).filter { case (key, value) => key != value }
9289
'{ QueryMeta.apply[T](${ Expr(resultMap) }) }
9390

94-
end QueryMeta
95-
9691
inline def queryMeta[T](inline fields: (T => (Any, String))*): QueryMeta[T] = ${ queryMetaImpl[T]('fields) }
9792

9893
private def queryMetaImpl[T: Type](expr: Expr[Seq[(T => (Any, String))]])(using q: Quotes): Expr[QueryMeta[T]] = {
@@ -138,7 +133,6 @@ private def withRenamingImpl[T: Type](meta: Expr[QueryMeta[T]], exprs: Expr[Seq[
138133
val resultMap = oldMeta.map ++ newMeta.map
139134

140135
'{ QueryMeta.apply[T](${ Expr(resultMap) }) }
141-
end withRenamingImpl
142136

143137
def extractFieldsMap(fieldsNames: List[String], fieldsTypes: List[Type[?]])(using
144138
q: Quotes
@@ -180,7 +174,6 @@ def extractFieldsMap(fieldsNames: List[String], fieldsTypes: List[Type[?]])(usin
180174
case _ => None
181175
}
182176
.toMap
183-
end extractFieldsMap
184177

185178
def summonChildMeta[T: Type](using q: Quotes): Map[String, String] =
186179
import q.reflect.*
@@ -192,8 +185,6 @@ def summonChildMeta[T: Type](using q: Quotes): Map[String, String] =
192185
val childrenMeta = extractFieldsMap(caseFieldsNames, caseFieldsTypes)
193186
merge(identityMeta, childrenMeta)
194187

195-
end summonChildMeta
196-
197188
def merge(first: Map[String, String], children: Map[String, Map[String, String]]) =
198189
first.flatMap { case (first, second) =>
199190
children.getOrElse(first, Map.empty).map { case (firstA, secondA) =>

oolong-mongo/src/main/scala/oolong/mongo/MongoQueryCompiler.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ object MongoQueryCompiler extends Backend[QExpr, MQ, BsonDocument] {
198198
s"""${fields.map(f => s"\"$f\": 1").mkString(", ")}"""
199199
case MQ.Field(field) =>
200200
report.errorAndAbort(s"There is no filter condition on field ${field.mkString(".")}")
201-
end rec
202201

203202
def renderArrays(x: List[MQ] | MQ)(using Quotes): String = x match
204203
case list: List[MQ @unchecked] => list.map(rec).mkString(", ")
@@ -209,7 +208,6 @@ object MongoQueryCompiler extends Backend[QExpr, MQ, BsonDocument] {
209208
case _ => "?"
210209

211210
"{ " + rec(node) + " }"
212-
end render
213211

214212
override def target(optRepr: MongoQueryNode)(using quotes: Quotes): Expr[BsonDocument] =
215213
import quotes.reflect.*

0 commit comments

Comments
 (0)