@@ -134,7 +134,7 @@ class Namer { typer: Typer =>
134134 * The logic here is very subtle and fragile due to the fact that
135135 * we are not allowed to force anything.
136136 */
137- def checkNoConflict (name : Name , isPrivate : Boolean , span : Span )(using Context ): Name =
137+ def checkNoConflict (name : Name , span : Span )(using Context ): Name =
138138 val owner = ctx.owner
139139 var conflictsDetected = false
140140
@@ -169,7 +169,7 @@ class Namer { typer: Typer =>
169169 def preExisting = ctx.effectiveScope.lookup(name)
170170 if (! owner.isClass || name.isTypeName) && preExisting.exists then
171171 conflict(preExisting)
172- else if owner.isPackageObject && ! isPrivate && name != nme.CONSTRUCTOR then
172+ else if owner.isPackageObject && name != nme.CONSTRUCTOR then
173173 checkNoConflictIn(owner.owner)
174174 for pkgObj <- pkgObjs(owner.owner) if pkgObj != owner do
175175 checkNoConflictIn(pkgObj)
@@ -249,7 +249,7 @@ class Namer { typer: Typer =>
249249 var flags = checkFlags(tree.mods.flags)
250250 if ctx.settings.YcompileScala2Library .value then
251251 flags |= Scala2x
252- val name = checkNoConflict(tree.name, flags.is( Private ), tree.span).asTypeName
252+ val name = checkNoConflict(tree.name, tree.span).asTypeName
253253 val cls =
254254 createOrRefine[ClassSymbol ](tree, name, flags, ctx.owner,
255255 cls => adjustIfModule(new ClassCompleter (cls, tree)(ctx), tree),
@@ -258,7 +258,7 @@ class Namer { typer: Typer =>
258258 cls
259259 case tree : MemberDef =>
260260 var flags = checkFlags(tree.mods.flags)
261- val name = checkNoConflict(tree.name, flags.is( Private ), tree.span)
261+ val name = checkNoConflict(tree.name, tree.span)
262262 tree match
263263 case tree : ValOrDefDef =>
264264 if tree.isInstanceOf [ValDef ] && ! flags.is(Param ) && name.endsWith(" _=" ) then
@@ -1264,7 +1264,7 @@ class Namer { typer: Typer =>
12641264 val hasDefaults = sym.hasDefaultParams // compute here to ensure HasDefaultParams and NoDefaultParams flags are set
12651265 val forwarder =
12661266 if mbr.isType then
1267- val forwarderName = checkNoConflict(alias.toTypeName, isPrivate = false , span)
1267+ val forwarderName = checkNoConflict(alias.toTypeName, span)
12681268 var target = pathType.select(sym)
12691269 if target.typeParams.nonEmpty then
12701270 target = target.etaExpand
@@ -1320,7 +1320,7 @@ class Namer { typer: Typer =>
13201320 (EmptyFlags , mbrInfo)
13211321 var mbrFlags = MandatoryExportTermFlags | maybeStable | (sym.flags & RetainedExportTermFlags )
13221322 if pathMethod.exists then mbrFlags |= ExtensionMethod
1323- val forwarderName = checkNoConflict(alias, isPrivate = false , span)
1323+ val forwarderName = checkNoConflict(alias, span)
13241324 newSymbol(cls, forwarderName, mbrFlags, mbrInfo, coord = span)
13251325
13261326 forwarder.info = avoidPrivateLeaks(forwarder)
0 commit comments