Merge pull request #3889 from som-snytt/issue/6476-alt

SI-6476 Improve error on escapement 

2 files changed, 2 insertions, 20 deletions

diff --git a/test/files/neg/t8266-invalid-interp.check b/test/files/neg/t8266-invalid-interp.check
index 70dd4081b0..bb2d44a80c 100644
--- a/test/files/neg/t8266-invalid-interp.check
+++ b/test/files/neg/t8266-invalid-interp.check
@@ -1,10 +1,10 @@
 t8266-invalid-interp.scala:4: error: Trailing '\' escapes nothing.
     f"a\",
        ^
-t8266-invalid-interp.scala:5: error: invalid escape character at index 1 in "a\xc"
+t8266-invalid-interp.scala:5: error: invalid escape '\x' not one of [\b, \t, \n, \f, \r, \\, \", \'] at index 1 in "a\xc". Use \\ for literal \.
     f"a\xc",
        ^
-t8266-invalid-interp.scala:7: error: invalid escape character at index 1 in "a\vc"
+t8266-invalid-interp.scala:7: error: invalid escape '\v' not one of [\b, \t, \n, \f, \r, \\, \", \'] at index 1 in "a\vc". Use \\ for literal \.
     f"a\vc"
        ^
 three errors found
diff --git a/test/files/run/t6631.scala b/test/files/run/t6631.scala
deleted file mode 100644
index e472b83d50..0000000000
--- a/test/files/run/t6631.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-import reflect.ClassTag
-
-object Test extends App {
-  def intercept[T <: Throwable : ClassTag](act: => Any) = try {
-    act
-  } catch {
-    case x: Throwable =>
-      val cls = implicitly[ClassTag[T]].runtimeClass
-      assert(cls.isInstance(x), (x.getClass, x, cls).toString)
-  }
-  assert(s"""\f\r\n\t""" == "\f\r\n\t")
-
-  import StringContext.InvalidEscapeException
-  intercept[InvalidEscapeException](s"""\""")
-  intercept[InvalidEscapeException](s"""\x""")
-  intercept[InvalidEscapeException](s"\")
-
-}