Skip to content

Commit a62ec3c

Browse files
committed
Address reviewer comments
1 parent 238d875 commit a62ec3c

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/dotty/tools/dotc/core/TypeComparer.scala

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,7 @@ class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling {
10401040
private def mergeConflict(tp1: Type, tp2: Type): Type = {
10411041
def showType(tp: Type) = tp match {
10421042
case ClassInfo(_, cls, _, _, _) => cls.showLocated
1043-
case bounds: TypeBounds => "type bounds" + bounds.show
1043+
case bounds: TypeBounds => i"type bounds $bounds"
10441044
case _ => tp.show
10451045
}
10461046
throw new MergeError(s"cannot merge ${showType(tp1)} with ${showType(tp2)}")
@@ -1061,10 +1061,6 @@ class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling {
10611061
case _ => tp.show
10621062
}
10631063

1064-
/** The error message kernel for a merge conflict */
1065-
private def mergeErrorMsg(tp1: Type, tp2: Type)(implicit ctx: Context) =
1066-
s"cannot merge ${showType(tp1)} with ${showType(tp2)}"
1067-
10681064
/** A comparison function to pick a winner in case of a merge conflict */
10691065
private def isAsGood(tp1: Type, tp2: Type): Boolean = tp1 match {
10701066
case tp1: ClassInfo =>

0 commit comments

Comments
 (0)