From 0081a4d21ad89f8d4dc2cbcb84fbada5018af09c Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 30 Jul 2019 14:28:11 +0200 Subject: [PATCH 1/2] Use Expr.unitExpr --- library/src-bootstrapped/scala/quoted/package.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src-bootstrapped/scala/quoted/package.scala b/library/src-bootstrapped/scala/quoted/package.scala index 7a1448e939ab..e12ed1214368 100644 --- a/library/src-bootstrapped/scala/quoted/package.scala +++ b/library/src-bootstrapped/scala/quoted/package.scala @@ -38,7 +38,7 @@ package object quoted { var result: T = NoResult.asInstanceOf[T] def dummyRun given QuoteContext: Expr[Unit] = { result = thunk - '{} + Expr.unitExpr } toolbox.run(dummyRun given _) assert(result != NoResult) // toolbox.run should have thrown an exception From 5fe39be0d6594b9e90cc55d6499ab1a69266a0ad Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 30 Jul 2019 14:33:35 +0200 Subject: [PATCH 2/2] Move source file from `library/src-bootstrapped` to `library/src` --- .../scala/quoted/package.scala | 20 ------------------- .../scala/quoted/package.scala | 0 2 files changed, 20 deletions(-) delete mode 100644 library/src-non-bootstrapped/scala/quoted/package.scala rename library/{src-bootstrapped => src}/scala/quoted/package.scala (100%) diff --git a/library/src-non-bootstrapped/scala/quoted/package.scala b/library/src-non-bootstrapped/scala/quoted/package.scala deleted file mode 100644 index 51e19c14f400..000000000000 --- a/library/src-non-bootstrapped/scala/quoted/package.scala +++ /dev/null @@ -1,20 +0,0 @@ -package scala - -package object quoted { - - def run[T](expr: given QuoteContext => Expr[T]) given (toolbox: Toolbox): T = - throw new Exception("Non bootsrapped library") - - def withQuoteContext[T](thunk: given QuoteContext => T) given (toolbox: Toolbox): T = - throw new Exception("Non bootsrapped library") - - implicit object ExprOps { - def (x: T) toExpr[T: Liftable] given QuoteContext: Expr[T] = the[Liftable[T]].toExpr(x) - - def (seq: Seq[Expr[T]]) toExprOfSeq[T] given (tp: Type[T], qctx: QuoteContext): Expr[Seq[T]] = - throw new Exception("Non bootsrapped library") - - def (list: List[Expr[T]]) toExprOfList[T] given Type[T], QuoteContext: Expr[List[T]] = - throw new Exception("Non bootsrapped library") - } -} diff --git a/library/src-bootstrapped/scala/quoted/package.scala b/library/src/scala/quoted/package.scala similarity index 100% rename from library/src-bootstrapped/scala/quoted/package.scala rename to library/src/scala/quoted/package.scala