diff options
5 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/ant/ScalaTool.scala b/src/compiler/scala/tools/ant/ScalaTool.scala index a4a8366f84..b024a62527 100644 --- a/src/compiler/scala/tools/ant/ScalaTool.scala +++ b/src/compiler/scala/tools/ant/ScalaTool.scala @@ -334,7 +334,7 @@ package scala.tools.ant { if (mainClass.isEmpty) error("Main class must be set.") if (platforms.isEmpty) platforms = Platforms.values if (name.isEmpty) name = Some(file.get.getName) - val patches = ListMap.Empty. + val patches = ListMap.empty. update("name", name.get). update("class", mainClass.get). update("version", version). diff --git a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala index 6b509a44de..dbc2b1807d 100644 --- a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala +++ b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala @@ -35,7 +35,7 @@ abstract class DocGenerator extends Models { def contentFrame = "contentFrame" def classesFrame = "classesFrame" def modulesFrame = "modulesFrame" - def emptyMap = ListMap.Empty[Kind, TreeSet[HasTree]] + def emptyMap = ListMap.empty[Kind, TreeSet[HasTree]] override def acceptPrivate = false @@ -792,7 +792,7 @@ abstract class DocGenerator extends Models { def process(units: Iterator[CompilationUnit]): Unit = { var members = emptyMap - var topLevel = ListMap.Empty[ModuleClassSymbol, ListMap[Kind,TreeSet[HasTree]]] + var topLevel = ListMap.empty[ModuleClassSymbol, ListMap[Kind,TreeSet[HasTree]]] for (val unit <- units) { val sourceMod = new SourceMod(unit) for (val mmbr <- sourceMod.members) mmbr.tree match { diff --git a/src/compiler/scala/tools/nsc/transform/LiftCode.scala b/src/compiler/scala/tools/nsc/transform/LiftCode.scala index 9e87b4fee4..3a633bb2c7 100644 --- a/src/compiler/scala/tools/nsc/transform/LiftCode.scala +++ b/src/compiler/scala/tools/nsc/transform/LiftCode.scala @@ -287,7 +287,7 @@ abstract class LiftCode extends Transform { new Reifier(new ReifyEnvironment(), reflect.NoSymbol).reify(tree) def inject(code: reflect.Tree): Tree = - new Injector(ListMap.Empty, new FreshNameCreator).inject(code) + new Injector(ListMap.empty, new FreshNameCreator).inject(code) def codify (tree: Tree): Tree = New(TypeTree(appliedType(definitions.CodeClass.typeConstructor, diff --git a/src/library/scala/collection/immutable/ListMap.scala b/src/library/scala/collection/immutable/ListMap.scala index 006bf9d49f..4ce9c4cc39 100644 --- a/src/library/scala/collection/immutable/ListMap.scala +++ b/src/library/scala/collection/immutable/ListMap.scala @@ -30,7 +30,7 @@ object ListMap { /** This class implements immutable maps using a list-based data * structure. Instances of <code>ListMap</code> represent * empty maps; they can be either created by calling the constructor - * directly, or by applying the function <code>ListMap.Empty</code>. + * directly, or by applying the function <code>ListMap.empty</code>. * * @author Matthias Zenger * @author Martin Oderskty diff --git a/src/library/scala/collection/immutable/ListSet.scala b/src/library/scala/collection/immutable/ListSet.scala index 42d627426e..e869e6258d 100644 --- a/src/library/scala/collection/immutable/ListSet.scala +++ b/src/library/scala/collection/immutable/ListSet.scala @@ -34,7 +34,7 @@ object ListSet { /** This class implements immutable sets using a list-based data * structure. Instances of <code>ListSet</code> represent * empty sets; they can be either created by calling the constructor - * directly, or by applying the function <code>ListSet.Empty</code>. + * directly, or by applying the function <code>ListSet.empty</code>. * * @author Matthias Zenger * @version 1.0, 09/07/2003 |