Restored :warnings to working order.

As seen here.

scala> class A { @deprecated("foo") def a = 1 }
warning: there were 1 deprecation warnings; re-run with -deprecation for details
defined class A

scala> :warnings
<console>:7: warning: @deprecated now takes two arguments; see the scaladoc.
       class A { @deprecated("foo") def a = 1 }
                  ^

scala> val x = 5 toString
warning: there were 1 feature warnings; re-run with -feature for details
x: String = 5

scala> :warnings
<console>:7: warning: postfix operator toString should be enabled
by making the implicit value language.postfixOps visible.
This can be achieved by adding the import clause 'import language.postfixOps'
or by setting the compiler option -language:postfixOps.
See the Scala docs for value scala.language.postfixOps for a discussion
why the feature should be explicitly enabled.
       val x = 5 toString
                 ^

6 files changed, 407 insertions, 426 deletions

diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
index b567293a3f..0e1658ff17 100644
--- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala
@@ -438,7 +438,10 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter)
   }
 
   private def warningsCommand(): Result = {
-    intp.lastWarnings foreach { case (pos, msg) => intp.reporter.warning(pos, msg) }
+    if (intp.lastWarnings.isEmpty)
+      "Can't find any cached warnings."
+    else
+      intp.lastWarnings foreach { case (pos, msg) => intp.reporter.warning(pos, msg) }
   }
 
   private def javapCommand(line: String): Result = {
diff --git a/src/compiler/scala/tools/nsc/interpreter/IMain.scala b/src/compiler/scala/tools/nsc/interpreter/IMain.scala
index 7bdbff8627..e6a142934d 100644
--- a/src/compiler/scala/tools/nsc/interpreter/IMain.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/IMain.scala
@@ -108,27 +108,19 @@ class IMain(initialSettings: Settings, protected val out: JPrintWriter) extends
     else new PathResolver(settings).result.asURLs  // the compiler's classpath
   )
   def settings = currentSettings
-  def savingSettings[T](fn: Settings => Unit)(body: => T): T = {
-    val saved = currentSettings
-    currentSettings = saved.copy()
-    fn(currentSettings)
-    try body
-    finally currentSettings = saved
-  }
   def mostRecentLine = prevRequestList match {
     case Nil      => ""
     case req :: _ => req.originalLine
   }
-  def rerunWith(names: String*) = {
-    savingSettings((ss: Settings) => {
-      import ss._
-      names flatMap lookupSetting foreach {
-        case s: BooleanSetting => s.value = true
-        case _                 => ()
-      }
-    })(interpret(mostRecentLine))
+  // Run the code body with the given boolean settings flipped to true.
+  def withoutWarnings[T](body: => T): T = beQuietDuring {
+    val saved = settings.nowarn.value
+    if (!saved)
+      settings.nowarn.value = true
+
+    try body
+    finally if (!saved) settings.nowarn.value = false
   }
-  def rerunForWarnings = rerunWith("-deprecation", "-unchecked", "-Xlint")
 
   /** construct an interpreter that reports to Console */
   def this(settings: Settings) = this(settings, new NewLinePrintWriter(new ConsoleWriter, true))
@@ -699,6 +691,10 @@ class IMain(initialSettings: Settings, protected val out: JPrintWriter) extends
   class ReadEvalPrint(lineId: Int) {
     def this() = this(freshLineId())
 
+    private var lastRun: Run = _
+    private var evalCaught: Option[Throwable] = None
+    private var conditionalWarnings: List[ConditionalWarning] = Nil
+
     val packageName = sessionNames.line + lineId
     val readName    = sessionNames.read
     val evalName    = sessionNames.eval
@@ -754,7 +750,6 @@ class IMain(initialSettings: Settings, protected val out: JPrintWriter) extends
       catch { case ex: Throwable => evalError(path, unwrap(ex)) }
     }
 
-    var evalCaught: Option[Throwable] = None
     lazy val evalClass = load(evalPath)
     lazy val evalValue = callEither(resultName) match {
       case Left(ex)      => evalCaught = Some(ex) ; None
@@ -776,27 +771,25 @@ class IMain(initialSettings: Settings, protected val out: JPrintWriter) extends
     /** We get a bunch of repeated warnings for reasons I haven't
      *  entirely figured out yet.  For now, squash.
      */
-    private def removeDupWarnings(xs: List[(Position, String)]): List[(Position, String)] = {
-      if (xs.isEmpty)
-        return Nil
-
-      val ((pos, msg)) :: rest = xs
-      val filtered = rest filter { case (pos0, msg0) =>
-        (msg != msg0) || (pos.lineContent.trim != pos0.lineContent.trim) || {
-          // same messages and same line content after whitespace removal
-          // but we want to let through multiple warnings on the same line
-          // from the same run.  The untrimmed line will be the same since
-          // there's no whitespace indenting blowing it.
-          (pos.lineContent == pos0.lineContent)
-        }
+    private def updateRecentWarnings(run: Run) {
+      def loop(xs: List[(Position, String)]): List[(Position, String)] = xs match {
+        case Nil                  => Nil
+        case ((pos, msg)) :: rest =>
+          val filtered = rest filter { case (pos0, msg0) =>
+            (msg != msg0) || (pos.lineContent.trim != pos0.lineContent.trim) || {
+              // same messages and same line content after whitespace removal
+              // but we want to let through multiple warnings on the same line
+              // from the same run.  The untrimmed line will be the same since
+              // there's no whitespace indenting blowing it.
+              (pos.lineContent == pos0.lineContent)
+            }
+          }
+          ((pos, msg)) :: loop(filtered)
       }
-      ((pos, msg)) :: removeDupWarnings(filtered)
+      val warnings = loop(run.allConditionalWarnings flatMap (_.warnings))
+      if (warnings.nonEmpty)
+        mostRecentWarnings = warnings
     }
-    def lastWarnings: List[(Position, String)] = (
-      if (lastRun == null) Nil
-      else removeDupWarnings(lastRun.allConditionalWarnings flatMap (_.warnings))
-    )
-    private var lastRun: Run = _
     private def evalMethod(name: String) = evalClass.getMethods filter (_.getName == name) match {
       case Array(method) => method
       case xs            => sys.error("Internal error: eval object " + evalClass + ", " + xs.mkString("\n", "\n", ""))
@@ -804,6 +797,7 @@ class IMain(initialSettings: Settings, protected val out: JPrintWriter) extends
     private def compileAndSaveRun(label: String, code: String) = {
       showCodeIfDebugging(code)
       val (success, run) = compileSourcesKeepingRun(new BatchSourceFile(label, packaged(code)))
+      updateRecentWarnings(run)
       lastRun = run
       success
     }
@@ -953,11 +947,7 @@ class IMain(initialSettings: Settings, protected val out: JPrintWriter) extends
         }
 
         // compile the result-extraction object
-        beQuietDuring {
-          savingSettings(_.nowarn.value = true) {
-            lineRep compile ResultObjectSourceCode(handlers)
-          }
-        }
+        withoutWarnings(lineRep compile ResultObjectSourceCode(handlers))
       }
     }
 
@@ -1008,12 +998,8 @@ class IMain(initialSettings: Settings, protected val out: JPrintWriter) extends
       case _                        => naming.mostRecentVar
     })
 
-  def lastWarnings: List[(global.Position, String)] = (
-    prevRequests.reverseIterator
-       map (_.lineRep.lastWarnings)
-      find (_.nonEmpty)
-      getOrElse Nil
-  )
+  private var mostRecentWarnings: List[(global.Position, String)] = Nil
+  def lastWarnings = mostRecentWarnings
 
   def treesForRequestId(id: Int): List[Tree] =
     requestForReqId(id).toList flatMap (_.trees)
diff --git a/test/files/jvm/interpreter.check b/test/files/jvm/interpreter.check
index dc835bf8b6..6145b6c4d2 100644
--- a/test/files/jvm/interpreter.check
+++ b/test/files/jvm/interpreter.check
@@ -1,374 +1,373 @@
-Type in expressions to have them evaluated.

-Type :help for more information.

-

-scala> 

-

-scala> // basics

-

-scala> 3+4

-res0: Int = 7

-

-scala> def gcd(x: Int, y: Int): Int = {

-          if (x == 0) y

-          else if (y == 0) x

-          else gcd(y%x, x)

-}

-gcd: (x: Int, y: Int)Int

-

-scala> val five = gcd(15,35)

-five: Int = 5

-

-scala> var x = 1

-x: Int = 1

-

-scala> x = 2

-x: Int = 2

-

-scala> val three = x+1

-three: Int = 3

-

-scala> type anotherint = Int

-defined type alias anotherint

-

-scala> val four: anotherint = 4

-four: anotherint = 4

-

-scala> val bogus: anotherint = "hello"

-<console>:8: error: type mismatch;

- found   : String("hello")

- required: anotherint

-    (which expands to)  Int

-       val bogus: anotherint = "hello"

-                               ^

-

-scala> trait PointlessTrait

-defined trait PointlessTrait

-

-scala> val (x,y) = (2,3)

-x: Int = 2

-y: Int = 3

-

-scala> println("hello")

-hello

-

-scala> 

-

-scala> // ticket #1513

-

-scala> val t1513 = Array(null)

-t1513: Array[Null] = Array(null)

-

-scala> // ambiguous toString problem from #547

-

-scala> val atom = new scala.xml.Atom()

-atom: scala.xml.Atom[Unit] = ()

-

-scala> // overriding toString problem from #1404

-

-scala> class S(override val toString : String)

-defined class S

-

-scala> val fish = new S("fish")

-fish: S = fish

-

-scala> // Test that arrays pretty print nicely.

-

-scala> val arr = Array("What's", "up", "doc?")

-arr: Array[String] = Array(What's, up, doc?)

-

-scala> // Test that arrays pretty print nicely, even when we give them type Any

-

-scala> val arrInt : Any = Array(1,2,3)

-arrInt: Any = Array(1, 2, 3)

-

-scala> // Test that nested arrays are pretty-printed correctly

-

-scala> val arrArrInt : Any = Array(Array(1, 2), Array(3, 4))

-arrArrInt: Any = Array(Array(1, 2), Array(3, 4))

-

-scala> 

-

-scala> // implicit conversions

-

-scala> case class Foo(n: Int)

-defined class Foo

-

-scala> case class Bar(n: Int)

-defined class Bar

-

-scala> implicit def foo2bar(foo: Foo) = Bar(foo.n)

-warning: there were 1 feature warnings; re-run with -feature for details

-foo2bar: (foo: Foo)Bar

-

-scala> val bar: Bar = Foo(3)

-bar: Bar = Bar(3)

-

-scala> 

-

-scala> // importing from a previous result

-

-scala> import bar._

-import bar._

-

-scala> val m = n

-m: Int = 3

-

-scala> 

-

-scala> // stressing the imports mechanism

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> val one = 1

-one: Int = 1

-

-scala> 

-

-scala> 

-

-scala> val x1 = 1

-x1: Int = 1

-

-scala> val x2 = 1

-x2: Int = 1

-

-scala> val x3 = 1

-x3: Int = 1

-

-scala> val x4 = 1

-x4: Int = 1

-

-scala> val x5 = 1

-x5: Int = 1

-

-scala> val x6 = 1

-x6: Int = 1

-

-scala> val x7 = 1

-x7: Int = 1

-

-scala> val x8 = 1

-x8: Int = 1

-

-scala> val x9 = 1

-x9: Int = 1

-

-scala> val x10 = 1

-x10: Int = 1

-

-scala> val x11 = 1

-x11: Int = 1

-

-scala> val x12 = 1

-x12: Int = 1

-

-scala> val x13 = 1

-x13: Int = 1

-

-scala> val x14 = 1

-x14: Int = 1

-

-scala> val x15 = 1

-x15: Int = 1

-

-scala> val x16 = 1

-x16: Int = 1

-

-scala> val x17 = 1

-x17: Int = 1

-

-scala> val x18 = 1

-x18: Int = 1

-

-scala> val x19 = 1

-x19: Int = 1

-

-scala> val x20 = 1

-x20: Int = 1

-

-scala> 

-

-scala> val two = one + x5

-two: Int = 2

-

-scala> 

-

-scala> // handling generic wildcard arrays (#2386)

-

-scala> // It's put here because type feedback is an important part of it.

-

-scala> val xs: Array[_] = Array(1, 2)

-xs: Array[_] = Array(1, 2)

-

-scala> xs.size

-res2: Int = 2

-

-scala> xs.head

-res3: Any = 1

-

-scala> xs filter (_ == 2)

-res4: Array[_] = Array(2)

-

-scala> xs map (_ => "abc")

-res5: Array[String] = Array(abc, abc)

-

-scala> xs map (x => x)

-res6: Array[_] = Array(1, 2)

-

-scala> xs map (x => (x, x))

-warning: there were 1 feature warnings; re-run with -feature for details

-warning: there were 1 feature warnings; re-run with -feature for details

-res7: Array[(_$1, _$1)] forSome { type _$1 } = Array((1,1), (2,2))

-

-scala> 

-

-scala> // interior syntax errors should *not* go into multi-line input mode.

-

-scala> // both of the following should abort immediately:

-

-scala> def x => y => z

-<console>:1: error: '=' expected but '=>' found.

-       def x => y => z

-             ^

-

-scala> [1,2,3]

-<console>:1: error: illegal start of definition

-       [1,2,3]

-       ^

-

-scala> 

-

-scala> 

-

-scala> // multi-line XML

-

-scala> <a>

-<b

-  c="c"

-  d="dd"

-/></a>

-res8: scala.xml.Elem = 

-<a>

-<b c="c" d="dd"/></a>

-

-scala> 

-

-scala> 

-

-scala> /*

-  /*

-    multi-line comment

-  */

-*/

-

-

-You typed two blank lines.  Starting a new command.

-

-scala> // multi-line string

-

-scala> """

-hello

-there

-"""

-res12: String = 

-"

-hello

-there

-"

-

-scala> 

-

-scala> (1 +   // give up early by typing two blank lines

-

-

-You typed two blank lines.  Starting a new command.

-

-scala> // defining and using quoted names should work (ticket #323)

-

-scala> def `match` = 1

-match: Int

-

-scala> val x = `match`

-x: Int = 1

-

-scala> 

-

-scala> // multiple classes defined on one line

-

-scala> sealed class Exp; class Fact extends Exp; class Term extends Exp

-defined class Exp

-defined class Fact

-defined class Term

-

-scala> def f(e: Exp) = e match {  // non-exhaustive warning here

-  case _:Fact => 3

-}

-<console>:18: warning: match is not exhaustive!

-missing combination            Exp

-missing combination           Term

-

-       def f(e: Exp) = e match {  // non-exhaustive warning here

-                       ^

-f: (e: Exp)Int

-

-scala> 

-

-scala> 

+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> 
+
+scala> // basics
+
+scala> 3+4
+res0: Int = 7
+
+scala> def gcd(x: Int, y: Int): Int = {
+          if (x == 0) y
+          else if (y == 0) x
+          else gcd(y%x, x)
+}
+gcd: (x: Int, y: Int)Int
+
+scala> val five = gcd(15,35)
+five: Int = 5
+
+scala> var x = 1
+x: Int = 1
+
+scala> x = 2
+x: Int = 2
+
+scala> val three = x+1
+three: Int = 3
+
+scala> type anotherint = Int
+defined type alias anotherint
+
+scala> val four: anotherint = 4
+four: anotherint = 4
+
+scala> val bogus: anotherint = "hello"
+<console>:8: error: type mismatch;
+ found   : String("hello")
+ required: anotherint
+    (which expands to)  Int
+       val bogus: anotherint = "hello"
+                               ^
+
+scala> trait PointlessTrait
+defined trait PointlessTrait
+
+scala> val (x,y) = (2,3)
+x: Int = 2
+y: Int = 3
+
+scala> println("hello")
+hello
+
+scala> 
+
+scala> // ticket #1513
+
+scala> val t1513 = Array(null)
+t1513: Array[Null] = Array(null)
+
+scala> // ambiguous toString problem from #547
+
+scala> val atom = new scala.xml.Atom()
+atom: scala.xml.Atom[Unit] = ()
+
+scala> // overriding toString problem from #1404
+
+scala> class S(override val toString : String)
+defined class S
+
+scala> val fish = new S("fish")
+fish: S = fish
+
+scala> // Test that arrays pretty print nicely.
+
+scala> val arr = Array("What's", "up", "doc?")
+arr: Array[String] = Array(What's, up, doc?)
+
+scala> // Test that arrays pretty print nicely, even when we give them type Any
+
+scala> val arrInt : Any = Array(1,2,3)
+arrInt: Any = Array(1, 2, 3)
+
+scala> // Test that nested arrays are pretty-printed correctly
+
+scala> val arrArrInt : Any = Array(Array(1, 2), Array(3, 4))
+arrArrInt: Any = Array(Array(1, 2), Array(3, 4))
+
+scala> 
+
+scala> // implicit conversions
+
+scala> case class Foo(n: Int)
+defined class Foo
+
+scala> case class Bar(n: Int)
+defined class Bar
+
+scala> implicit def foo2bar(foo: Foo) = Bar(foo.n)
+warning: there were 1 feature warnings; re-run with -feature for details
+foo2bar: (foo: Foo)Bar
+
+scala> val bar: Bar = Foo(3)
+bar: Bar = Bar(3)
+
+scala> 
+
+scala> // importing from a previous result
+
+scala> import bar._
+import bar._
+
+scala> val m = n
+m: Int = 3
+
+scala> 
+
+scala> // stressing the imports mechanism
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> val one = 1
+one: Int = 1
+
+scala> 
+
+scala> 
+
+scala> val x1 = 1
+x1: Int = 1
+
+scala> val x2 = 1
+x2: Int = 1
+
+scala> val x3 = 1
+x3: Int = 1
+
+scala> val x4 = 1
+x4: Int = 1
+
+scala> val x5 = 1
+x5: Int = 1
+
+scala> val x6 = 1
+x6: Int = 1
+
+scala> val x7 = 1
+x7: Int = 1
+
+scala> val x8 = 1
+x8: Int = 1
+
+scala> val x9 = 1
+x9: Int = 1
+
+scala> val x10 = 1
+x10: Int = 1
+
+scala> val x11 = 1
+x11: Int = 1
+
+scala> val x12 = 1
+x12: Int = 1
+
+scala> val x13 = 1
+x13: Int = 1
+
+scala> val x14 = 1
+x14: Int = 1
+
+scala> val x15 = 1
+x15: Int = 1
+
+scala> val x16 = 1
+x16: Int = 1
+
+scala> val x17 = 1
+x17: Int = 1
+
+scala> val x18 = 1
+x18: Int = 1
+
+scala> val x19 = 1
+x19: Int = 1
+
+scala> val x20 = 1
+x20: Int = 1
+
+scala> 
+
+scala> val two = one + x5
+two: Int = 2
+
+scala> 
+
+scala> // handling generic wildcard arrays (#2386)
+
+scala> // It's put here because type feedback is an important part of it.
+
+scala> val xs: Array[_] = Array(1, 2)
+xs: Array[_] = Array(1, 2)
+
+scala> xs.size
+res2: Int = 2
+
+scala> xs.head
+res3: Any = 1
+
+scala> xs filter (_ == 2)
+res4: Array[_] = Array(2)
+
+scala> xs map (_ => "abc")
+res5: Array[String] = Array(abc, abc)
+
+scala> xs map (x => x)
+res6: Array[_] = Array(1, 2)
+
+scala> xs map (x => (x, x))
+warning: there were 1 feature warnings; re-run with -feature for details
+res7: Array[(_$1, _$1)] forSome { type _$1 } = Array((1,1), (2,2))
+
+scala> 
+
+scala> // interior syntax errors should *not* go into multi-line input mode.
+
+scala> // both of the following should abort immediately:
+
+scala> def x => y => z
+<console>:1: error: '=' expected but '=>' found.
+       def x => y => z
+             ^
+
+scala> [1,2,3]
+<console>:1: error: illegal start of definition
+       [1,2,3]
+       ^
+
+scala> 
+
+scala> 
+
+scala> // multi-line XML
+
+scala> <a>
+<b
+  c="c"
+  d="dd"
+/></a>
+res8: scala.xml.Elem = 
+<a>
+<b c="c" d="dd"/></a>
+
+scala> 
+
+scala> 
+
+scala> /*
+  /*
+    multi-line comment
+  */
+*/
+
+
+You typed two blank lines.  Starting a new command.
+
+scala> // multi-line string
+
+scala> """
+hello
+there
+"""
+res12: String = 
+"
+hello
+there
+"
+
+scala> 
+
+scala> (1 +   // give up early by typing two blank lines
+
+
+You typed two blank lines.  Starting a new command.
+
+scala> // defining and using quoted names should work (ticket #323)
+
+scala> def `match` = 1
+match: Int
+
+scala> val x = `match`
+x: Int = 1
+
+scala> 
+
+scala> // multiple classes defined on one line
+
+scala> sealed class Exp; class Fact extends Exp; class Term extends Exp
+defined class Exp
+defined class Fact
+defined class Term
+
+scala> def f(e: Exp) = e match {  // non-exhaustive warning here
+  case _:Fact => 3
+}
+<console>:18: warning: match is not exhaustive!
+missing combination            Exp
+missing combination           Term
+
+       def f(e: Exp) = e match {  // non-exhaustive warning here
+                       ^
+f: (e: Exp)Int
+
+scala> 
+
+scala> 
 plusOne: (x: Int)Int
 res0: Int = 6
 res0: String = after reset
diff --git a/test/files/run/constrained-types.check b/test/files/run/constrained-types.check
index 37784a20ca..da97a378e6 100644
--- a/test/files/run/constrained-types.check
+++ b/test/files/run/constrained-types.check
@@ -76,12 +76,10 @@ four: String = four
 
 scala> val four2 = m(four) // should have an existential bound
 warning: there were 1 feature warnings; re-run with -feature for details
-warning: there were 1 feature warnings; re-run with -feature for details
 four2: String @Annot(x) forSome { val x: String } = four
 
 scala> val four3 = four2   // should have the same type as four2
 warning: there were 1 feature warnings; re-run with -feature for details
-warning: there were 1 feature warnings; re-run with -feature for details
 four3: String @Annot(x) forSome { val x: String } = four
 
 scala> val stuff = m("stuff") // should not crash
@@ -105,7 +103,6 @@ scala> def m = {
   y
 } // x should not escape the local scope with a narrow type
 warning: there were 1 feature warnings; re-run with -feature for details
-warning: there were 1 feature warnings; re-run with -feature for details
 m: String @Annot(x) forSome { val x: String }
 
 scala> 
diff --git a/test/files/run/t4172.check b/test/files/run/t4172.check
index 4598e02d1f..f16c9e5151 100644
--- a/test/files/run/t4172.check
+++ b/test/files/run/t4172.check
@@ -5,7 +5,6 @@ scala>
 
 scala>     val c = { class C { override def toString = "C" }; ((new C, new C { def f = 2 })) }
 warning: there were 1 feature warnings; re-run with -feature for details
-warning: there were 1 feature warnings; re-run with -feature for details
 c: (C, C{def f: Int}) forSome { type C <: Object } = (C,C)
 
 scala> 
diff --git a/test/files/run/t4542.check b/test/files/run/t4542.check
index a0600ba859..cd7a2905e2 100644
--- a/test/files/run/t4542.check
+++ b/test/files/run/t4542.check
@@ -15,9 +15,6 @@ scala> val f = new Foo
 <console>:8: warning: class Foo is deprecated: foooo
        val f = new Foo
                    ^
-<console>:5: warning: class Foo is deprecated: foooo
-  lazy val $result = `f`
-           ^
 f: Foo = Bippy
 
 scala>