diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-05-04 10:33:34 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-05-04 10:33:34 +0200 |
| commit | 1199fa1553d44244e3dd05b52339fb0bb3c5fb3f (patch) | |
| tree | 06a68276815498bef0e7936afa4c2b99807bab49 | |
| parent | 2f9ea6ea533f1e08a1c50b87300666224a03fada (diff) | |
| parent | a094654b4dc4a9d911f36ab8bfc7451872bcee53 (diff) | |
| download | scala-1199fa1553d44244e3dd05b52339fb0bb3c5fb3f.tar.gz scala-1199fa1553d44244e3dd05b52339fb0bb3c5fb3f.tar.bz2 scala-1199fa1553d44244e3dd05b52339fb0bb3c5fb3f.zip | |
Merge pull request #4488 from gbasler/topic/files-in-wrong-place
Cleanup files in wrong place
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/patmat/Logic.scala | 3 | ||||
| -rw-r--r-- | test/files/neg/virtpatmat_exhaust_big.check (renamed from src/intellij/test/files/neg/virtpatmat_exhaust_big.check) | 0 | ||||
| -rw-r--r-- | test/files/neg/virtpatmat_exhaust_big.flags (renamed from src/intellij/test/files/neg/virtpatmat_exhaust_big.flags) | 0 | ||||
| -rw-r--r-- | test/files/neg/virtpatmat_exhaust_big.scala (renamed from src/intellij/test/files/neg/virtpatmat_exhaust_big.scala) | 0 | ||||
| -rw-r--r-- | test/files/pos/virtpatmat_exhaust_big.scala (renamed from src/intellij/test/files/pos/virtpatmat_exhaust_big.scala) | 3 |
5 files changed, 2 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala b/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala index cef22d7d6b..227c45b3a7 100644 --- a/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala +++ b/src/compiler/scala/tools/nsc/transform/patmat/Logic.scala @@ -384,9 +384,8 @@ trait Logic extends Debugging { // ... and what must not? excluded foreach { excludedSym => - val related = Set(sym, excludedSym) val exclusive = v.groupedDomains.exists { - domain => related subsetOf domain.toSet + domain => domain.contains(sym) && domain.contains(excludedSym) } // TODO: populate `v.exclusiveDomains` with `Set`s from the start, and optimize to: diff --git a/src/intellij/test/files/neg/virtpatmat_exhaust_big.check b/test/files/neg/virtpatmat_exhaust_big.check index fddc85a362..fddc85a362 100644 --- a/src/intellij/test/files/neg/virtpatmat_exhaust_big.check +++ b/test/files/neg/virtpatmat_exhaust_big.check diff --git a/src/intellij/test/files/neg/virtpatmat_exhaust_big.flags b/test/files/neg/virtpatmat_exhaust_big.flags index b5a8748652..b5a8748652 100644 --- a/src/intellij/test/files/neg/virtpatmat_exhaust_big.flags +++ b/test/files/neg/virtpatmat_exhaust_big.flags diff --git a/src/intellij/test/files/neg/virtpatmat_exhaust_big.scala b/test/files/neg/virtpatmat_exhaust_big.scala index dd639eb56e..dd639eb56e 100644 --- a/src/intellij/test/files/neg/virtpatmat_exhaust_big.scala +++ b/test/files/neg/virtpatmat_exhaust_big.scala diff --git a/src/intellij/test/files/pos/virtpatmat_exhaust_big.scala b/test/files/pos/virtpatmat_exhaust_big.scala index 41aef3226e..9850933540 100644 --- a/src/intellij/test/files/pos/virtpatmat_exhaust_big.scala +++ b/test/files/pos/virtpatmat_exhaust_big.scala @@ -30,5 +30,4 @@ object Test { Z10 | Z11() | Z12 | Z13() | Z14 | Z15() | Z16 | Z17() | Z18 | Z19() => } -} -- +}
\ No newline at end of file |