diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-06-27 16:18:56 +0200 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-06-27 16:18:56 +0200 |
commit | 03af96588cbab178d4520e7604319fd5a52ddb24 (patch) | |
tree | 95d759126288315f403e421199901f1f5262f809 /test/files/jvm | |
parent | 6887029f100e2c3a90534768da074472f39cf14f (diff) | |
parent | fbfce33cb03bc2b41dd0f46fa9f4630036b4f2ca (diff) | |
download | scala-03af96588cbab178d4520e7604319fd5a52ddb24.tar.gz scala-03af96588cbab178d4520e7604319fd5a52ddb24.tar.bz2 scala-03af96588cbab178d4520e7604319fd5a52ddb24.zip |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-2.12.x-20140627
Diffstat (limited to 'test/files/jvm')
-rw-r--r-- | test/files/jvm/deprecation.check | 2 | ||||
-rw-r--r-- | test/files/jvm/future-spec.check | 2 | ||||
-rw-r--r-- | test/files/jvm/interpreter.check | 4 | ||||
-rw-r--r-- | test/files/jvm/serialization-new.check | 2 | ||||
-rw-r--r-- | test/files/jvm/serialization.check | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/test/files/jvm/deprecation.check b/test/files/jvm/deprecation.check index d116778d3f..3c27d4d082 100644 --- a/test/files/jvm/deprecation.check +++ b/test/files/jvm/deprecation.check @@ -1,3 +1,3 @@ -warning: there were 4 deprecation warning(s); re-run with -deprecation for details +warning: there were 4 deprecation warnings; re-run with -deprecation for details Note: deprecation/Use_2.java uses or overrides a deprecated API. Note: Recompile with -Xlint:deprecation for details. diff --git a/test/files/jvm/future-spec.check b/test/files/jvm/future-spec.check index 844ca54682..df1629dd7e 100644 --- a/test/files/jvm/future-spec.check +++ b/test/files/jvm/future-spec.check @@ -1 +1 @@ -warning: there were 1 deprecation warning(s); re-run with -deprecation for details +warning: there was one deprecation warning; re-run with -deprecation for details diff --git a/test/files/jvm/interpreter.check b/test/files/jvm/interpreter.check index b55ecc10e6..d124794e72 100644 --- a/test/files/jvm/interpreter.check +++ b/test/files/jvm/interpreter.check @@ -95,7 +95,7 @@ scala> case class Bar(n: Int) defined class Bar scala> implicit def foo2bar(foo: Foo) = Bar(foo.n) -warning: there were 1 feature warning(s); re-run with -feature for details +warning: there was one feature warning; re-run with -feature for details foo2bar: (foo: Foo)Bar scala> val bar: Bar = Foo(3) @@ -269,7 +269,7 @@ scala> xs map (x => x) res6: Array[_] = Array(1, 2) scala> xs map (x => (x, x)) -warning: there were 1 feature warning(s); re-run with -feature for details +warning: there was one feature warning; re-run with -feature for details res7: Array[(_$1, _$1)] forSome { type _$1 } = Array((1,1), (2,2)) scala> diff --git a/test/files/jvm/serialization-new.check b/test/files/jvm/serialization-new.check index 47d7bfd920..8ec5754ea2 100644 --- a/test/files/jvm/serialization-new.check +++ b/test/files/jvm/serialization-new.check @@ -1,4 +1,4 @@ -warning: there were 2 deprecation warning(s); re-run with -deprecation for details +warning: there were 2 deprecation warnings; re-run with -deprecation for details a1 = Array[1,2,3] _a1 = Array[1,2,3] arrayEquals(a1, _a1): true diff --git a/test/files/jvm/serialization.check b/test/files/jvm/serialization.check index 47d7bfd920..8ec5754ea2 100644 --- a/test/files/jvm/serialization.check +++ b/test/files/jvm/serialization.check @@ -1,4 +1,4 @@ -warning: there were 2 deprecation warning(s); re-run with -deprecation for details +warning: there were 2 deprecation warnings; re-run with -deprecation for details a1 = Array[1,2,3] _a1 = Array[1,2,3] arrayEquals(a1, _a1): true |