Skip to content

Commit 5a20984

Browse files
committed
Fix merge errors
Updates to make dotty compile after rebase
1 parent 5e448ff commit 5a20984

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/dotty/tools/dotc/sbt/ExtractDependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ private class ExtractDependenciesCollector(implicit val ctx: Context) extends tp
164164
sym.isEffectiveRoot ||
165165
sym.isAnonymousFunction ||
166166
sym.isAnonymousClass ||
167-
sym.isLambdaTrait
167+
sym.isLambdaTraitOBS
168168

169169
private def addInheritanceDependency(sym: Symbol): Unit =
170170
_topLevelInheritanceDependencies += sym.topLevelClass

src/dotty/tools/dotc/typer/Implicits.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,12 +284,12 @@ trait ImplicitRunInfo { self: RunInfo =>
284284
override implicit protected val ctx: Context = liftingCtx
285285
override def stopAtStatic = true
286286
def apply(tp: Type) = tp match {
287-
case tp: TypeRef if tp.symbol.isLambdaTrait =>
287+
case tp: TypeRef if tp.symbol.isLambdaTraitOBS =>
288288
defn.AnyType
289289
case tp: TypeRef if tp.symbol.isAbstractOrAliasType =>
290290
val pre = tp.prefix
291291
def joinClass(tp: Type, cls: ClassSymbol) =
292-
if (cls.isLambdaTrait) tp
292+
if (cls.isLambdaTraitOBS) tp
293293
else AndType.make(tp, cls.typeRef.asSeenFrom(pre, cls.owner))
294294
val lead = if (tp.prefix eq NoPrefix) defn.AnyType else apply(tp.prefix)
295295
(lead /: tp.classSymbols)(joinClass)

0 commit comments

Comments
 (0)