Fix rebase breakage

G1ng3r · Sep 20, 2018 · e9fe005 · e9fe005
1 parent c4f95f9
commit e9fe005
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sbt-bridge/test/xsbt/DependencySpecification.scala b/sbt-bridge/test/xsbt/DependencySpecification.scala
@@ -92,7 +92,7 @@ class DependencySpecification {
       """object A {
         |   def foo = { B; () }
         |}""".stripMargin
-    val srcB = "object B { println("foo") }"
+    val srcB = """object B { println("foo") }"""
 
     val compilerForTesting = new ScalaCompilerForUnitTesting
     val classDependencies =

diff --git a/tests/run/xml-interpolation/XmlQuote_1.scala b/tests/run/xml-interpolation/XmlQuote_1.scala
@@ -6,13 +6,13 @@ import scala.language.implicitConversions
 case class Xml(parts: String, args: List[Any])
 
 // Ideally should be an implicit class but the implicit conversion
-// has to be a rewrite method
+// has to be a inline method
 class XmlQuote(ctx: => StringContext) {
-  rewrite def xml(args: => Any*): Xml = ~XmlQuote.impl('(ctx), '(args))
+  inline def xml(args: => Any*): Xml = ~XmlQuote.impl('(ctx), '(args))
 }
 
 object XmlQuote {
-  implicit rewrite def XmlQuote(ctx: => StringContext): XmlQuote = new XmlQuote(ctx)
+  implicit inline def XmlQuote(ctx: => StringContext): XmlQuote = new XmlQuote(ctx)
 
   def impl(ctx: Expr[StringContext], args: Expr[Seq[Any]])
           (implicit tasty: Tasty): Expr[Xml] = {