diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-06-03 12:44:50 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-06-03 12:44:50 -0700 |
| commit | 09f0814d2fbad488e92c60d7df363d12f350d869 (patch) | |
| tree | f0b6a44c54b799f746af9f97260c2c6cff606013 /test | |
| parent | 8aa1d1cd210bb205e25f7618f038d646a2788fa1 (diff) | |
| parent | 08b7399ef4a2e01ef20259ab04512e0e20f2b04b (diff) | |
| download | scala-09f0814d2fbad488e92c60d7df363d12f350d869.tar.gz scala-09f0814d2fbad488e92c60d7df363d12f350d869.tar.bz2 scala-09f0814d2fbad488e92c60d7df363d12f350d869.zip | |
Merge pull request #664 from adriaanm/revert-653
Revert "#653 -- no lub for statement exprs' types"
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/neg/checksensible.check | 4 | ||||
| -rw-r--r-- | test/files/neg/checksensible.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/neg/checksensible.check b/test/files/neg/checksensible.check index 772d58322d..23af94180a 100644 --- a/test/files/neg/checksensible.check +++ b/test/files/neg/checksensible.check @@ -77,8 +77,8 @@ checksensible.scala:63: error: comparing a fresh object using `!=' will always y new Exception() != new Exception()
^
checksensible.scala:66: error: comparing values of types Int and Null using `==' will always yield false
- val dummy = if (foo.length == null) "plante" else "plante pas"
- ^
+ if (foo.length == null) "plante" else "plante pas"
+ ^
checksensible.scala:71: error: comparing values of types Bip and Bop using `==' will always yield false
(x1 == x2)
^
diff --git a/test/files/neg/checksensible.scala b/test/files/neg/checksensible.scala index 15a9b6d9b6..27ee908153 100644 --- a/test/files/neg/checksensible.scala +++ b/test/files/neg/checksensible.scala @@ -63,7 +63,7 @@ class EqEqRefTest { new Exception() != new Exception() val foo: Array[String] = Array("1","2","3") - val dummy = if (foo.length == null) "plante" else "plante pas" + if (foo.length == null) "plante" else "plante pas" // final classes with default equals val x1 = new Bip |