diff options
| author | Martin Odersky <odersky@gmail.com> | 2015-11-07 22:49:21 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2015-11-09 15:45:39 +0100 |
| commit | af6ffc319cb23c5ade01251a93810f7a33429e58 (patch) | |
| tree | 99dd27434fcc4fd37aeaae359ea5d0e1f9700767 /src/dotty/tools/dotc/core/TypeComparer.scala | |
| parent | 5398c5a723b0f8b0d35e6c3ad230c5046169e837 (diff) | |
| download | dotty-af6ffc319cb23c5ade01251a93810f7a33429e58.tar.gz dotty-af6ffc319cb23c5ade01251a93810f7a33429e58.tar.bz2 dotty-af6ffc319cb23c5ade01251a93810f7a33429e58.zip | |
Renamings in Definitions
TypeRef becomes Type, thus removing duplicates. Where
...Type was used in an extraction (e.g. ArrayType(...),
FunctionType(...)), we now use ...Of.
Diffstat (limited to 'src/dotty/tools/dotc/core/TypeComparer.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/TypeComparer.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/TypeComparer.scala b/src/dotty/tools/dotc/core/TypeComparer.scala index 684e9cbfd..2045de3ce 100644 --- a/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/src/dotty/tools/dotc/core/TypeComparer.scala @@ -808,7 +808,7 @@ class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling { /** The greatest lower bound of a list types */ final def glb(tps: List[Type]): Type = - (defn.AnyType /: tps)(glb) + ((defn.AnyType: Type) /: tps)(glb) /** The least upper bound of two types * @note We do not admit singleton types in or-types as lubs. @@ -837,7 +837,7 @@ class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling { /** The least upper bound of a list of types */ final def lub(tps: List[Type]): Type = - (defn.NothingType /: tps)(lub) + ((defn.NothingType: Type) /: tps)(lub) /** Merge `t1` into `tp2` if t1 is a subtype of some &-summand of tp2. */ |