diff options
author | Eugene Burmako <xeno.by@gmail.com> | 2014-02-07 14:44:46 +0100 |
---|---|---|
committer | Eugene Burmako <xeno.by@gmail.com> | 2014-02-07 14:55:55 +0100 |
commit | 1adb3379c7ac568317db5739f1d6df628f58b65d (patch) | |
tree | 37b6f3992d04fe3bb8fa133e9709ccb73f7e0127 /src/compiler/scala/tools/nsc/typechecker/Namers.scala | |
parent | 97515efec9baac6ff38a2a83059c8a6a92549385 (diff) | |
download | scala-1adb3379c7ac568317db5739f1d6df628f58b65d.tar.gz scala-1adb3379c7ac568317db5739f1d6df628f58b65d.tar.bz2 scala-1adb3379c7ac568317db5739f1d6df628f58b65d.zip |
renames resetLocalAttrs to resetAttrs
Now when resetAllAttrs is gone, we can use a shorter name for the one
and only resetLocalAttrs.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 645f267a21..632e25aa2e 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -1205,7 +1205,7 @@ trait Namers extends MethodSynthesis { * flag. */ private def addDefaultGetters(meth: Symbol, ddef: DefDef, vparamss: List[List[ValDef]], tparams: List[TypeDef], overriddenSymbol: => Symbol) { - val DefDef(_, _, rtparams0, rvparamss0, _, _) = resetLocalAttrs(ddef.duplicate) + val DefDef(_, _, rtparams0, rvparamss0, _, _) = resetAttrs(ddef.duplicate) // having defs here is important to make sure that there's no sneaky tree sharing // in methods with multiple default parameters def rtparams = rtparams0.map(_.duplicate) @@ -1292,7 +1292,7 @@ trait Namers extends MethodSynthesis { return // fix #3649 (prevent crash in erroneous source code) } } - val ClassDef(_, _, rtparams, _) = resetLocalAttrs(cdef.duplicate) + val ClassDef(_, _, rtparams, _) = resetAttrs(cdef.duplicate) defTparams = rtparams.map(rt => copyTypeDef(rt)(mods = rt.mods &~ (COVARIANT | CONTRAVARIANT))) nmr } |