summaryrefslogtreecommitdiff
path: root/test/files/run/constrained-types.check
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-02-05 00:46:58 +0100
committerHubert Plociniczak <hubert.plociniczak@gmail.com>2013-02-08 17:51:43 +0100
commite0068b908517768e900a3945e483e9c379d728d8 (patch)
tree680ac5fb751dc183c70a2db6f73670a041dd1c95 /test/files/run/constrained-types.check
parent8d25d05e9bf848d763e7b657d9c7e96ea5cb8daf (diff)
downloadscala-e0068b908517768e900a3945e483e9c379d728d8.tar.gz
scala-e0068b908517768e900a3945e483e9c379d728d8.tar.bz2
scala-e0068b908517768e900a3945e483e9c379d728d8.zip
SI-5675 Discard duplicate feature warnings at a position
When -feature has not been enabled, we were double counting identical feature warnings that were emitted at the same position. Normal error reporting only reports the first time a warning appears at a position; feature warning counter incrementing should behave the same way. @hubertp: Fixed .check files that were broken in the original commit.
Diffstat (limited to 'test/files/run/constrained-types.check')
-rw-r--r--test/files/run/constrained-types.check8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/files/run/constrained-types.check b/test/files/run/constrained-types.check
index da97a378e6..85c4f41872 100644
--- a/test/files/run/constrained-types.check
+++ b/test/files/run/constrained-types.check
@@ -75,11 +75,11 @@ scala> var four = "four"
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 warning(s); 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 warning(s); re-run with -feature for details
four3: String @Annot(x) forSome { val x: String } = four
scala> val stuff = m("stuff") // should not crash
@@ -102,7 +102,7 @@ scala> def m = {
val y : String @Annot(x) = x
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 warning(s); re-run with -feature for details
m: String @Annot(x) forSome { val x: String }
scala>
@@ -116,7 +116,7 @@ scala> def n(y: String) = {
}
m("stuff".stripMargin)
} // x should be existentially bound
-warning: there were 1 feature warnings; re-run with -feature for details
+warning: there were 1 feature warning(s); re-run with -feature for details
n: (y: String)String @Annot(x) forSome { val x: String }
scala>