diff options
| author | Paul Phillips <paulp@improving.org> | 2012-09-14 12:10:57 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-09-15 08:01:19 -0700 |
| commit | 3262f7072b4060b1058acb6d772eaa61d4dec1d4 (patch) | |
| tree | 8a4e0f285145d1f429096ad8dc08b90e846b5c38 /src/compiler/scala/tools/nsc/typechecker/Analyzer.scala | |
| parent | 930c85d6c96507d798d1847ea078eebf93dc0acb (diff) | |
| parent | 83c1b1062957e50e5336c1b3409e54e0a5cce275 (diff) | |
| download | scala-3262f7072b4060b1058acb6d772eaa61d4dec1d4.tar.gz scala-3262f7072b4060b1058acb6d772eaa61d4dec1d4.tar.bz2 scala-3262f7072b4060b1058acb6d772eaa61d4dec1d4.zip | |
Merge remote-tracking branch 'origin/2.10.x' into merge-210
* origin/2.10.x: (68 commits)
Eliminate breaking relative names in source.
"Hot fix" for broken build.
Fix SI-4813 - Clone doesn't work on LinkedList.
Made 'def clone()' consistent with parens everywhere.
accommodates pull request feedback
SI-6310 redeploys the starr
SI-6310 AbsTypeTag => WeakTypeTag
SI-6323 outlaws free types from TypeTag
SI-6323 prohibits reflection against free types
improvements for reification of free symbols
removes build.newFreeExistential
SI-6359 Deep prohibition of templates in value class
Fixes SI-6259. Unable to use typeOf in super call of top-level object.
Fixes binary repo push for new typesafe repo layouts.
Better error message for pattern arity errors.
Rescued TreeBuilder from the parser.
Pending test for SI-3943
Test case for a bug fixed in M7.
Fix for SI-6367, exponential time in inference.
SI-6306 Remove incorrect eta-expansion optimization in Uncurry
...
Conflicts:
src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Analyzer.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Analyzer.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala b/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala index 8218289f93..3526d932d3 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala @@ -6,7 +6,7 @@ package scala.tools.nsc package typechecker -import reflect.internal.util.Statistics +import scala.reflect.internal.util.Statistics /** The main attribution phase. */ @@ -72,7 +72,7 @@ trait Analyzer extends AnyRef } object typerFactory extends SubComponent { - import reflect.internal.TypesStats.typerNanos + import scala.reflect.internal.TypesStats.typerNanos val global: Analyzer.this.global.type = Analyzer.this.global val phaseName = "typer" val runsAfter = List[String]() |