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/Duplicators.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/Duplicators.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Duplicators.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala b/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala index 745250e167..2dd0836322 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Duplicators.scala @@ -29,7 +29,7 @@ abstract class Duplicators extends Analyzer { * the old class with the new class, and map symbols through the given 'env'. The * environment is a map from type skolems to concrete types (see SpecializedTypes). */ - def retyped(context: Context, tree: Tree, oldThis: Symbol, newThis: Symbol, env: collection.Map[Symbol, Type]): Tree = { + def retyped(context: Context, tree: Tree, oldThis: Symbol, newThis: Symbol, env: scala.collection.Map[Symbol, Type]): Tree = { if (oldThis ne newThis) { oldClassOwner = oldThis newClassOwner = newThis |