File tree 2 files changed +2
-14
lines changed
compiler/src/dotty/tools/dotc/transform
tests/pos-special/fatal-warnings 2 files changed +2
-14
lines changed Original file line number Diff line number Diff line change @@ -661,10 +661,8 @@ object CheckUnused:
661
661
val simpleSelections = qual.tpe.member(sym.name).alternatives
662
662
val typeSelections = sels.flatMap(n => qual.tpe.member(n.name.toTypeName).alternatives)
663
663
val termSelections = sels.flatMap(n => qual.tpe.member(n.name.toTermName).alternatives)
664
- val sameTermPath = qual.isTerm && sym.exists && sym.owner.isType && qual.tpe.typeSymbol == sym.owner.asType
665
664
val selectionsToDealias = typeSelections ::: termSelections
666
- val renamedSelection = if sameTermPath then sels.find(sel => sel.imported.name == sym.name) else None
667
- val qualHasSymbol = simpleSelections.map(_.symbol).contains(sym) || (simpleSelections ::: selectionsToDealias).map(_.symbol).map(dealias).contains(dealiasedSym) || renamedSelection.isDefined
665
+ val qualHasSymbol = simpleSelections.map(_.symbol).contains(sym) || (simpleSelections ::: selectionsToDealias).map(_.symbol).map(dealias).contains(dealiasedSym)
668
666
def selector = sels.find(sel => (sel.name.toTermName == sym.name || sel.name.toTypeName == sym.name) && symName.map(n => n.toTermName == sel.rename).getOrElse(true ))
669
667
def dealiasedSelector = if (isDerived) sels.flatMap(sel => selectionsToDealias.map(m => (sel, m.symbol))).collect {
670
668
case (sel, sym) if dealias(sym) == dealiasedSym => sel
@@ -674,7 +672,7 @@ object CheckUnused:
674
672
else None
675
673
def wildcard = sels.find(sel => sel.isWildcard && ((sym.is(Given ) == sel.isGiven && sel.bound.isEmpty) || sym.is(Implicit )))
676
674
if qualHasSymbol && (! isAccessible || sym.isRenamedSymbol(symName)) && sym.exists then
677
- selector.orElse(dealiasedSelector).orElse(givenSelector).orElse(wildcard).orElse(renamedSelection) // selector with name or wildcard (or given)
675
+ selector.orElse(dealiasedSelector).orElse(givenSelector).orElse(wildcard) // selector with name or wildcard (or given)
678
676
else
679
677
None
680
678
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments