Fix #5986: Make autolift on by default

biboudis · biboudis · commit d724a50c2b01 · 2019-03-27T17:00:35.000+01:00
diff --git a/library/src-bootstrapped/scala/quoted/package.scala b/library/src-bootstrapped/scala/quoted/package.scala
@@ -2,9 +2,14 @@ package scala
 
 package object quoted {
 
-  object autolift {
-    implicit def autoToExpr[T: Liftable](x: T): Expr[T] = x.toExpr
-  }
+  /** An implicit conversion that removes the clutter of using `toExpr`
+  *   ubiquitously.
+  *
+  *   Note: this is just merely a convenience and PCP still holds. If the user
+  *   needs to maintain the visual cue of exprs between splices, disabling this
+  *   with `import scala.quoted.{autolift => _, _}`, enforces the uses of `toExpr`.
+  */
+  implicit def autolift[T: Liftable](x: T): Expr[T] = x.toExpr
 
   implicit class LiftExprOps[T](val x: T) extends AnyVal {
     def toExpr(implicit ev: Liftable[T]): Expr[T] = ev.toExpr(x)
diff --git a/tests/disabled/run/xml-interpolation-3/XmlQuote_1.scala b/tests/disabled/run/xml-interpolation-3/XmlQuote_1.scala
@@ -1,6 +1,5 @@
 import scala.quoted._
 import scala.tasty.Tasty
-import scala.quoted.autolift._
 
 import scala.language.implicitConversions
 
diff --git a/tests/neg-with-compiler/quote-run-in-macro-1/quoted_1.scala b/tests/neg-with-compiler/quote-run-in-macro-1/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.quoted.Toolbox.Default._
 
diff --git a/tests/neg-with-compiler/quote-run-in-macro-2/quoted_1.scala b/tests/neg-with-compiler/quote-run-in-macro-2/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 import scala.quoted.Toolbox.Default._
 
 object Macros {
diff --git a/tests/neg/inline-case-objects/Macro_1.scala b/tests/neg/inline-case-objects/Macro_1.scala
@@ -1,6 +1,5 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Macros {
   def impl(foo: Any): Expr[String] = foo.getClass.getCanonicalName
diff --git a/tests/neg/inline-macro-staged-interpreter/Macro_1.scala b/tests/neg/inline-macro-staged-interpreter/Macro_1.scala
@@ -1,6 +1,5 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
 
 object E {
 
diff --git a/tests/neg/inline-option/Macro_1.scala b/tests/neg/inline-option/Macro_1.scala
@@ -1,6 +1,5 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Macro {
   def impl(opt: Option[Int]): Expr[Int] = opt match {
diff --git a/tests/neg/inline-tuples-1/Macro_1.scala b/tests/neg/inline-tuples-1/Macro_1.scala
@@ -1,6 +1,5 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Macros {
   def tup1(tup: Tuple1[Int]): Expr[Int] = tup.productIterator.map(_.asInstanceOf[Int]).sum
diff --git a/tests/neg/quote-interpolator-core-old.scala b/tests/neg/quote-interpolator-core-old.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 // This test checks the correct interpretation of the inlined value class
 
diff --git a/tests/neg/quote-macro-splice.scala b/tests/neg/quote-macro-splice.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Test {
 
diff --git a/tests/neg/splice-in-top-level-splice-1.scala b/tests/neg/splice-in-top-level-splice-1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Foo {
   inline def foo(): Int = ${bar(${x})} // error
diff --git a/tests/pending/run/tasty-comments/quoted_1.scala b/tests/pending/run/tasty-comments/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.tasty._
 
diff --git a/tests/pos-with-compiler/quote-0.scala b/tests/pos-with-compiler/quote-0.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.quoted.Toolbox.Default._
 
diff --git a/tests/pos/quote-nested-object/Macro_1.scala b/tests/pos/quote-nested-object/Macro_1.scala
@@ -1,6 +1,5 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Macro {
 
diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala b/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala
@@ -1,6 +1,5 @@
 import scala.quoted._
 import scala.tasty._
-import scala.quoted.autolift._
 
 object Foo {
 
diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala b/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 import scala.tasty._
 
 object Foo {
diff --git a/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala b/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.tasty._
 
diff --git a/tests/run-with-compiler-custom-args/staged-streams_1.scala b/tests/run-with-compiler-custom-args/staged-streams_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 /**
   * Port of the strymonas library as described in O. Kiselyov et al., Stream fusion, to completeness (POPL 2017)
diff --git a/tests/run-with-compiler/quote-impure-by-name/quoted_1.scala b/tests/run-with-compiler/quote-impure-by-name/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.quoted.Toolbox.Default._
 
diff --git a/tests/run-with-compiler/quote-inline-function/quoted_1.scala b/tests/run-with-compiler/quote-inline-function/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.quoted.Toolbox.Default._
 
diff --git a/tests/run-with-compiler/quote-lib.scala b/tests/run-with-compiler/quote-lib.scala
@@ -1,7 +1,6 @@
 
 import scala.quoted._
 import scala.quoted.Toolbox.Default._
-import scala.quoted.autolift._
 
 import liftable.Units._
 import liftable.Lets._
diff --git a/tests/run-with-compiler/quote-run-constants.scala b/tests/run-with-compiler/quote-run-constants.scala
@@ -1,6 +1,5 @@
 
 import scala.quoted.Toolbox.Default._
-import scala.quoted.autolift._
 
 import scala.quoted._
 
diff --git a/tests/run-with-compiler/quote-run-many.scala b/tests/run-with-compiler/quote-run-many.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Test {
   def main(args: Array[String]): Unit = {
diff --git a/tests/run-with-compiler/quote-run-staged-interpreter.scala b/tests/run-with-compiler/quote-run-staged-interpreter.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.quoted.Toolbox.Default._
 
diff --git a/tests/run-with-compiler/quote-show-blocks.scala b/tests/run-with-compiler/quote-show-blocks.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Test {
   def main(args: Array[String]): Unit = {
diff --git a/tests/run-with-compiler/quote-unrolled-foreach.scala b/tests/run-with-compiler/quote-unrolled-foreach.scala
@@ -1,6 +1,5 @@
 import scala.annotation.tailrec
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Test {
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make
diff --git a/tests/run-with-compiler/shonan-hmm-simple.scala b/tests/run-with-compiler/shonan-hmm-simple.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 trait Ring[T] {
   val zero: T
diff --git a/tests/run-with-compiler/shonan-hmm/Lifters.scala b/tests/run-with-compiler/shonan-hmm/Lifters.scala
@@ -3,7 +3,6 @@ import UnrolledExpr._
 
 import scala.reflect.ClassTag
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Lifters {
 
diff --git a/tests/run-with-compiler/shonan-hmm/MVmult.scala b/tests/run-with-compiler/shonan-hmm/MVmult.scala
@@ -1,7 +1,6 @@
 
 import scala.quoted.Toolbox.Default._
 import scala.quoted._
-import scala.quoted.autolift._
 
 class MVmult[Idx, T, Unt](tring: Ring[T], vec: VecROp[Idx, T, Unt]) {
   private[this] val blas2 = new Blas2(tring, vec)
diff --git a/tests/run-with-compiler/shonan-hmm/VecROp.scala b/tests/run-with-compiler/shonan-hmm/VecROp.scala
@@ -1,6 +1,5 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
 
 trait VecROp[Idx, T, Unt] extends VecOp[Idx, Unt] {
   def reduce: ((T, T) => T, T, Vec[Idx, T]) => T
diff --git a/tests/run-with-compiler/tasty-extractors-constants-2/quoted_1.scala b/tests/run-with-compiler/tasty-extractors-constants-2/quoted_1.scala
@@ -1,6 +1,5 @@
 import scala.quoted._
 import scala.quoted.Toolbox.Default._
-import scala.quoted.autolift._
 
 import scala.tasty._
 import scala.tasty.util._
diff --git a/tests/run/f-interpolation-1/FQuote_1.scala b/tests/run/f-interpolation-1/FQuote_1.scala
@@ -1,6 +1,5 @@
 import scala.quoted._
 import scala.tasty.Reflection
-import scala.quoted.autolift._
 
 import scala.language.implicitConversions
 
diff --git a/tests/run/i4734/Macro_1.scala b/tests/run/i4734/Macro_1.scala
@@ -1,6 +1,5 @@
 import scala.annotation.tailrec
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Macros {
   inline def unrolledForeach(seq: IndexedSeq[Int], f: => Int => Unit, inline unrollSize: Int): Unit = // or f: Int => Unit
diff --git a/tests/run/i4735/Macro_1.scala b/tests/run/i4735/Macro_1.scala
@@ -1,5 +1,4 @@
 import scala.annotation.tailrec
-import scala.quoted.autolift._
 
 import scala.quoted._
 
diff --git a/tests/run/i5119/Macro_1.scala b/tests/run/i5119/Macro_1.scala
@@ -1,6 +1,5 @@
 import scala.quoted._
 import scala.tasty.Reflection
-import scala.quoted.autolift._
 
 object Macro {
   class StringContextOps(sc: => StringContext) {
diff --git a/tests/run/i5119b/Macro_1.scala b/tests/run/i5119b/Macro_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.tasty.Reflection
 
diff --git a/tests/run/i5188a/Macro_1.scala b/tests/run/i5188a/Macro_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Lib {
   inline def sum(inline args: Int*): Int = ${ impl(args: _*) }
diff --git a/tests/run/inline-case-objects/Macro_1.scala b/tests/run/inline-case-objects/Macro_1.scala
@@ -1,6 +1,5 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Macros {
   def impl(foo: Any): Expr[String] = foo.getClass.getCanonicalName
diff --git a/tests/run/inline-macro-staged-interpreter/Macro_1.scala b/tests/run/inline-macro-staged-interpreter/Macro_1.scala
@@ -1,6 +1,5 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
 
 object E {
 
diff --git a/tests/run/inline-option/Macro_1.scala b/tests/run/inline-option/Macro_1.scala
@@ -1,6 +1,5 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run/inline-tuples-1/Macro_1.scala b/tests/run/inline-tuples-1/Macro_1.scala
@@ -1,6 +1,5 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Macros {
   def tup1(tup: Tuple1[Int]): Expr[Int] = tup.productIterator.map(_.asInstanceOf[Int]).sum
diff --git a/tests/run/inline-tuples-2/Macro_1.scala b/tests/run/inline-tuples-2/Macro_1.scala
@@ -1,6 +1,5 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run/inline-varargs-1/Macro_1.scala b/tests/run/inline-varargs-1/Macro_1.scala
@@ -1,6 +1,5 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Macros {
   def sum(nums: Int*): Expr[Int] = nums.sum
diff --git a/tests/run/quote-force/quoted_1.scala b/tests/run/quote-force/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 case class Location(owners: List[String])
 
diff --git a/tests/run/quote-simple-macro/quoted_1.scala b/tests/run/quote-simple-macro/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Macros {
   inline def foo(inline i: Int, dummy: Int, j: Int): Int = ${ bar(i, 'j) }
diff --git a/tests/run/quote-unrolled-foreach/quoted_1.scala b/tests/run/quote-unrolled-foreach/quoted_1.scala
@@ -1,6 +1,5 @@
 import scala.annotation.tailrec
 import scala.quoted._
-import scala.quoted.autolift._
 
 object Macro {
 
diff --git a/tests/run/tasty-argument-tree-1/quoted_1.scala b/tests/run/tasty-argument-tree-1/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.tasty._
 
diff --git a/tests/run/tasty-custom-show/quoted_1.scala b/tests/run/tasty-custom-show/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.tasty.Reflection
 
diff --git a/tests/run/tasty-definitions-1/quoted_1.scala b/tests/run/tasty-definitions-1/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.tasty._
 
diff --git a/tests/run/tasty-eval/quoted_1.scala b/tests/run/tasty-eval/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.tasty._
 
diff --git a/tests/run/tasty-extractors-1/quoted_1.scala b/tests/run/tasty-extractors-1/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.tasty._
 
diff --git a/tests/run/tasty-extractors-2/quoted_1.scala b/tests/run/tasty-extractors-2/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.tasty._
 
diff --git a/tests/run/tasty-extractors-3/quoted_1.scala b/tests/run/tasty-extractors-3/quoted_1.scala
@@ -1,7 +1,6 @@
 import scala.quoted._
 
 import scala.tasty.Reflection
-import scala.quoted.autolift._
 
 object Macros {
 
diff --git a/tests/run/tasty-extractors-constants-1/quoted_1.scala b/tests/run/tasty-extractors-constants-1/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.tasty._
 import scala.tasty.util._
diff --git a/tests/run/tasty-extractors-types/quoted_1.scala b/tests/run/tasty-extractors-types/quoted_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.tasty._
 
diff --git a/tests/run/tasty-getfile-implicit-fun-context/Macro_1.scala b/tests/run/tasty-getfile-implicit-fun-context/Macro_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.tasty.Reflection
 
diff --git a/tests/run/tasty-getfile/Macro_1.scala b/tests/run/tasty-getfile/Macro_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.tasty.Reflection
 
diff --git a/tests/run/tasty-indexed-map/quoted_1.scala b/tests/run/tasty-indexed-map/quoted_1.scala
@@ -1,6 +1,5 @@
 
 import scala.quoted._
-import scala.quoted.autolift._
 
 import scala.tasty._
 
diff --git a/tests/run/tasty-interpolation-1/Macro.scala b/tests/run/tasty-interpolation-1/Macro.scala
@@ -4,7 +4,6 @@ import scala.tasty.Reflection
 import scala.language.implicitConversions
 import scala.quoted.Exprs.LiftedExpr
 import scala.quoted.Toolbox.Default._
-import scala.quoted.autolift._
 
 object Macro {
 
diff --git a/tests/run/tasty-linenumber-2/quoted_1.scala b/tests/run/tasty-linenumber-2/quoted_1.scala
diff --git a/tests/run/tasty-linenumber/quoted_1.scala b/tests/run/tasty-linenumber/quoted_1.scala
diff --git a/tests/run/tasty-location/quoted_1.scala b/tests/run/tasty-location/quoted_1.scala
diff --git a/tests/run/tasty-original-source/Macros_1.scala b/tests/run/tasty-original-source/Macros_1.scala
diff --git a/tests/run/tasty-positioned/quoted_1.scala b/tests/run/tasty-positioned/quoted_1.scala
diff --git a/tests/run/tasty-subtyping/quoted_1.scala b/tests/run/tasty-subtyping/quoted_1.scala
diff --git a/tests/run/tasty-typeof/Macro_1.scala b/tests/run/tasty-typeof/Macro_1.scala
diff --git a/tests/run/xml-interpolation-1/XmlQuote_1.scala b/tests/run/xml-interpolation-1/XmlQuote_1.scala
diff --git a/tests/run/xml-interpolation-2/XmlQuote_1.scala b/tests/run/xml-interpolation-2/XmlQuote_1.scala
diff --git a/tests/run/xml-interpolation-3/XmlQuote_1.scala b/tests/run/xml-interpolation-3/XmlQuote_1.scala

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import scala.quoted._`
`2`		`-import scala.quoted.autolift._`
`3`	`2`
`4`	`3`	`import scala.quoted.Toolbox.Default._`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`
`2`	`2`	`import scala.quoted._`
`3`		`-import scala.quoted.autolift._`
`4`	`3`
`5`	`4`	`object E {`
`6`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import scala.annotation.tailrec`
`2`		`-import scala.quoted.autolift._`
`3`	`2`
`4`	`3`	`import scala.quoted._`
`5`	`4`