@@ -941,7 +941,7 @@ trait Implicits { self: Typer =>
941
941
* a diverging search
942
942
*/
943
943
def tryImplicit (cand : Candidate , contextual : Boolean ): SearchResult = {
944
- if (ctx.searchHistory.checkDivergence(cand, pt))
944
+ if (ctx.searchHistory.checkDivergence(cand, pt))
945
945
SearchFailure (new DivergingImplicit (cand.ref, pt.widenExpr, argument))
946
946
else {
947
947
val history = ctx.searchHistory.nest(cand, pt)
@@ -1180,7 +1180,7 @@ abstract class SearchHistory { outer =>
1180
1180
(if (cand1.ref == cand.ref) {
1181
1181
val wideTp = tp.widenExpr
1182
1182
lazy val wildTp = wildApprox(wideTp)
1183
- if (belowByname && (wildTp <:< wildPt)) Some (false )
1183
+ if (belowByname && (wildTp <:< wildPt)) Some (false )
1184
1184
else if ((wideTp.typeSize < ptSize && wideTp.coveringSet == ptCoveringSet) || (wildTp == wildPt)) Some (true )
1185
1185
else None
1186
1186
} else None ) match {
@@ -1197,7 +1197,7 @@ abstract class SearchHistory { outer =>
1197
1197
1198
1198
refBynameImplicit(widePt).orElse {
1199
1199
val bynamePt = isByname(pt)
1200
- if (! byname && ! bynamePt) None
1200
+ if (! byname && ! bynamePt) None
1201
1201
else {
1202
1202
@ tailrec
1203
1203
def loop (ois : List [(Candidate , Type )], belowByname : Boolean ): Option [Type ] = {
@@ -1228,7 +1228,7 @@ final class SearchRoot extends SearchHistory {
1228
1228
1229
1229
var implicitDictionary0 : mutable.Map [Type , (TermRef , tpd.Tree )] = null
1230
1230
def implicitDictionary = {
1231
- if (implicitDictionary0 == null )
1231
+ if (implicitDictionary0 == null )
1232
1232
implicitDictionary0 = mutable.Map .empty[Type , (TermRef , tpd.Tree )]
1233
1233
implicitDictionary0
1234
1234
}
@@ -1258,7 +1258,7 @@ final class SearchRoot extends SearchHistory {
1258
1258
}
1259
1259
1260
1260
override def emitDictionary (pos : Position , result : SearchResult )(implicit ctx : Context ): SearchResult = {
1261
- if (implicitDictionary == null || implicitDictionary.isEmpty) result
1261
+ if (implicitDictionary == null || implicitDictionary.isEmpty) result
1262
1262
else {
1263
1263
result match {
1264
1264
case failure : SearchFailure => failure
@@ -1276,7 +1276,7 @@ final class SearchRoot extends SearchHistory {
1276
1276
case _ => false
1277
1277
})
1278
1278
}
1279
- if (in.isEmpty) acc
1279
+ if (in.isEmpty) acc
1280
1280
else prune(in.map(_._2) ++ trees, out, in ++ acc)
1281
1281
}
1282
1282
0 commit comments