diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-14 14:28:17 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-14 14:28:17 -0700 |
| commit | 3fd4b1ee397ab649f606312a2b793d7faac61bcd (patch) | |
| tree | 6ddbfaf40a8803d2d13cecbb789831ece4cb2035 | |
| parent | 5db8e84cb0b92c4a5abe27574dfd51b8bd1fb54f (diff) | |
| parent | b5d213be082221a2b099ad2b4b85de901ff1a44b (diff) | |
| download | scala-3fd4b1ee397ab649f606312a2b793d7faac61bcd.tar.gz scala-3fd4b1ee397ab649f606312a2b793d7faac61bcd.tar.bz2 scala-3fd4b1ee397ab649f606312a2b793d7faac61bcd.zip | |
Merge branch 'master' into merge-inline
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala b/src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala index 455eb1d3b1..e6ad7cb922 100644 --- a/src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala +++ b/src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala @@ -11,7 +11,6 @@ import scala.collection.{ mutable, immutable } import scala.collection.mutable import scala.tools.nsc.util.FreshNameCreator import scala.runtime.ScalaRunTime.{ isAnyVal, isTuple } -import sun.tools.tree.OrExpression /** * Perform Step 1 in the inline classes SIP: Creates extension methods for all |