Merge pull request #4894 from dotty-staging/fix-#4891

Fix #4891: Make scala.quoted.Expr covariant

Author: Blaisorblade

library/src/scala/quoted/Expr.scala

@@ -2,7 +2,7 @@ package scala.quoted
 
 import scala.runtime.quoted.Unpickler.Pickled
 
-sealed abstract class Expr[T] {
+sealed abstract class Expr[+T] {
   final def unary_~ : T = throw new Error("~ should have been compiled away")
 
   /** Evaluate the contents of this expression and return the result.

tests/neg/i4774a.scala renamed to tests/pos/i4774a.scala

@@ -4,8 +4,6 @@ import scala.quoted._
 object Test {
   def loop[T](x: Expr[T])(implicit t: Type[T]): Expr[T] = '{
     val y: ~t = ~x
-    ~loop( // error: inferred loop[~t] where T should be used
-      '(y)
-    )
+    ~loop('(y))
   }
 }

tests/pos/i4891.scala

@@ -0,0 +1,5 @@
+import scala.quoted._
+
+object Test {
+  def foo: Expr[Option[String]] = '(None)
+}