Skip to content

Commit e1365d9

Browse files
authored
Merge pull request #3320 from dotty-staging/remove-warinings
Remove warnings
2 parents 0ad58ca + 2d04a78 commit e1365d9

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

compiler/src/dotty/tools/dotc/core/Types.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1523,9 +1523,9 @@ object Types {
15231523
if (mySig == null) mySig = Signature.NotAMethod
15241524
case designator: Symbol =>
15251525
uncheckedSetSym(designator)
1526-
case LocalName(underlying, space) =>
1527-
myNameSpace = space
1528-
decompose(underlying)
1526+
case designator: LocalName[_] =>
1527+
myNameSpace = designator.nameSpace
1528+
decompose(designator.name)
15291529
}
15301530
decompose(designator)
15311531
this

compiler/src/dotty/tools/repl/terminal/Utils.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ object FrontEndUtils {
178178
def transpose[A](xs: List[List[A]]): List[List[A]] = {
179179
@tailrec def transpose(xs: List[List[A]], result: List[List[A]]): List[List[A]] = {
180180
xs.filter(_.nonEmpty) match {
181-
case Nil => result
182-
case ys: List[List[A]] => transpose(ys.map(_.tail), ys.map(_.head) :: result)
181+
case Nil => result
182+
case ys => transpose(ys.map(_.tail), ys.map(_.head) :: result)
183183
}
184184
}
185185

doc-tool/src/dotty/tools/dottydoc/model/references.scala

+7-10
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,6 @@ object references {
2828
}
2929
final case class NoLink(title: String, target: String) extends MaterializableLink
3030

31-
object AndOrTypeReference {
32-
def unapply(ref: Reference): Option[(Reference, String, Reference)] = ref match {
33-
case OrTypeReference(left, right) => Some((left, "|", right))
34-
case AndTypeReference(left, right) => Some((left, "&", right))
35-
case _ => None
36-
}
37-
}
38-
3931
implicit class ReferenceShower(val ref: Reference) extends AnyVal {
4032
def showReference: String = ref match {
4133
case TypeReference(title, _, tparams) =>
@@ -44,8 +36,10 @@ object references {
4436
else ""
4537
}
4638

47-
case AndOrTypeReference(left, part, right) =>
48-
left.showReference + s" $part " + right.showReference
39+
case OrTypeReference(left, right) =>
40+
left.showReference + " | " + right.showReference
41+
case AndTypeReference(left, right) =>
42+
left.showReference + " & " + right.showReference
4943

5044
case FunctionReference(args, ret) =>
5145
if (args.isEmpty)
@@ -67,6 +61,9 @@ object references {
6761
s"$title: $byName${ref.showReference}$repeated"
6862

6963
case ConstantReference(title) => title
64+
case EmptyReference =>
65+
assert(false, "unexpected empty reference")
66+
"<empty reference>"
7067
}
7168
}
7269
}

doc-tool/src/dotty/tools/dottydoc/staticsite/tags.scala

+5-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,11 @@ object tags {
7979
else renderLink(baseurl, tpeLink)
8080
}
8181

82-
case AndOrTypeReference(left, sep, right) =>
83-
s"""${renderReference(left)}<span class="and-or-separator"> $sep </span>${renderReference(right)}"""
82+
case OrTypeReference(left, right) =>
83+
s"""${renderReference(left)}<span class="and-or-separator"> | </span>${renderReference(right)}"""
84+
85+
case AndTypeReference(left, right) =>
86+
s"""${renderReference(left)}<span class="and-or-separator"> &amp; </span>${renderReference(right)}"""
8487

8588
case FunctionReference(args, returnValue) => {
8689
val params =

0 commit comments

Comments
 (0)