Skip to content

Commit 8d010d1

Browse files
nicolasstuckicheeseng
authored andcommitted
Remove Type outer module
1 parent d296289 commit 8d010d1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

scalactic.dotty/src/main/scala/org/scalactic/BooleanMacro.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ object BooleanMacro {
4444
def exprStr: String = condition.show
4545
def defaultCase = '{ Bool.simpleMacroBool($condition, ${Expr(exprStr)}, $prettifier) }
4646
def isImplicitMethodType(tp: Type): Boolean =
47-
Type.IsMethodType.unapply(tp).flatMap(tp => if tp.isImplicit then Some(true) else None).nonEmpty
47+
IsMethodType.unapply(tp).flatMap(tp => if tp.isImplicit then Some(true) else None).nonEmpty
4848

4949
def isByNameMethodType(tp: Type): Boolean = tp.widen match {
50-
case Type.MethodType(_, Type.ByNameType(_) :: Nil, _) => true
50+
case MethodType(_, ByNameType(_) :: Nil, _) => true
5151
case _ => false
5252
}
5353

scalatest.dotty/src/main/scala/org/scalatest/diagrams/DiagramsMacro.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ object DiagramsMacro {
3333
def isXmlSugar(apply: Apply): Boolean = apply.tpe <:< typeOf[scala.xml.Elem]
3434
def isJavaStatic(tree: Tree): Boolean = tree.symbol.flags.is(Flags.Static)
3535
def isImplicitMethodType(tp: Type): Boolean =
36-
Type.IsMethodType.unapply(tp).flatMap(tp => if tp.isImplicit then Some(true) else None).nonEmpty
36+
IsMethodType.unapply(tp).flatMap(tp => if tp.isImplicit then Some(true) else None).nonEmpty
3737

3838
def selectField(o: Term, name: String): Term = Select.unique(o, name)
3939

@@ -61,7 +61,7 @@ object DiagramsMacro {
6161
def handleArgs(argTps: List[Type], args: List[Term]): (List[Term], List[Term]) =
6262
args.zip(argTps).foldLeft(Nil -> Nil : (List[Term], List[Term])) { case ((diagrams, others), pair) =>
6363
pair match {
64-
case (arg, Type.ByNameType(_)) =>
64+
case (arg, ByNameType(_)) =>
6565
(diagrams, others :+ arg)
6666
case (arg, tp) =>
6767
if (tp.widen.typeSymbol.show.startsWith("scala.Function")) (diagrams, others :+ arg)

0 commit comments

Comments
 (0)