diff options
| author | Paul Phillips <paulp@improving.org> | 2012-09-16 19:31:11 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-09-16 19:31:11 -0700 |
| commit | 5cf6a750eac94d159fe4c67b75e24dde13495e71 (patch) | |
| tree | d0791b6260049e95853c7a7a228a4cc45e8bca79 /src/partest | |
| parent | 112009844bb184acfeaef0435e142a3cfd5a895b (diff) | |
| parent | ea0d891f238082089be037a0752215d9d21893cf (diff) | |
| download | scala-5cf6a750eac94d159fe4c67b75e24dde13495e71.tar.gz scala-5cf6a750eac94d159fe4c67b75e24dde13495e71.tar.bz2 scala-5cf6a750eac94d159fe4c67b75e24dde13495e71.zip | |
Merge pull request #1309 from paulp/210-no-relative-paths
More relative path elimination.
Diffstat (limited to 'src/partest')
| -rw-r--r-- | src/partest/scala/tools/partest/package.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/partest/scala/tools/partest/package.scala b/src/partest/scala/tools/partest/package.scala index ec1778940f..ebd3e46b7c 100644 --- a/src/partest/scala/tools/partest/package.scala +++ b/src/partest/scala/tools/partest/package.scala @@ -30,8 +30,8 @@ package object partest { implicit private[partest] def temporaryPath2File(x: Path): JFile = x.jfile implicit private[partest] def temporaryFile2Path(x: JFile): Path = Path(x) - implicit lazy val postfixOps = language.postfixOps - implicit lazy val implicitConversions = language.implicitConversions + implicit lazy val postfixOps = scala.language.postfixOps + implicit lazy val implicitConversions = scala.language.implicitConversions def timed[T](body: => T): (T, Long) = { val t1 = System.currentTimeMillis @@ -75,7 +75,7 @@ package object partest { propOrEmpty("partest.debug") == "true" - import language.experimental.macros + import scala.language.experimental.macros /** * `trace("".isEmpty)` will return `true` and as a side effect print the following to standard out. |