diff options
author | odersky <odersky@gmail.com> | 2015-05-03 18:54:41 +0200 |
---|---|---|
committer | odersky <odersky@gmail.com> | 2015-05-03 18:54:41 +0200 |
commit | 8718d46194df369014d975e83a45215a5dfd88c9 (patch) | |
tree | 39d3c4dc273a5decc4cef5801a5f6ee1587efba0 | |
parent | bb6582bd265d22186570bef81d2a2f9ab3e23f9d (diff) | |
parent | 8708fb93b61707d6992d4171fda54bc376840330 (diff) | |
download | dotty-8718d46194df369014d975e83a45215a5dfd88c9.tar.gz dotty-8718d46194df369014d975e83a45215a5dfd88c9.tar.bz2 dotty-8718d46194df369014d975e83a45215a5dfd88c9.zip |
Merge pull request #527 from smarter/enable/strip-tvars-test
Enable test strip-tvars-for-lubbasetypes.scala and disable debug message
-rw-r--r-- | src/dotty/tools/dotc/core/ConstraintHandling.scala | 2 | ||||
-rw-r--r-- | tests/pos/strip-tvars-for-lubbasetypes.scala (renamed from tests/pending/pos/strip-tvars-for-lubbasetypes.scala) | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/dotty/tools/dotc/core/ConstraintHandling.scala b/src/dotty/tools/dotc/core/ConstraintHandling.scala index 8caacfb2f..544304e8a 100644 --- a/src/dotty/tools/dotc/core/ConstraintHandling.scala +++ b/src/dotty/tools/dotc/core/ConstraintHandling.scala @@ -191,7 +191,7 @@ trait ConstraintHandling { val lower = constraint.lower(param) val upper = constraint.upper(param) if (lower.nonEmpty && !bounds.lo.isRef(defn.NothingClass) || - upper.nonEmpty && !bounds.hi.isRef(defn.AnyClass)) println(i"INIT*** $pt") + upper.nonEmpty && !bounds.hi.isRef(defn.AnyClass)) constr.println(i"INIT*** $pt") lower.forall(addOneBound(_, bounds.hi, isUpper = true)) && upper.forall(addOneBound(_, bounds.lo, isUpper = false)) } diff --git a/tests/pending/pos/strip-tvars-for-lubbasetypes.scala b/tests/pos/strip-tvars-for-lubbasetypes.scala index 2be8625ba..128ca767c 100644 --- a/tests/pending/pos/strip-tvars-for-lubbasetypes.scala +++ b/tests/pos/strip-tvars-for-lubbasetypes.scala @@ -1,8 +1,8 @@ object Test { implicit final class EqualOps[T](val x: T) extends AnyVal { - def ===[T1, Ph >: T <: T1, Ph2 >: Ph <: T1](other: T1): Boolean = x == other - def !!![T1, Ph2 >: Ph <: T1, Ph >: T <: T1](other: T1): Boolean = x == other + def ===[T1 >: T, Ph >: T <: T1, Ph2 >: Ph <: T1](other: T1): Boolean = x == other + def !!![T1 >: T, Ph2 >: Ph <: T1, Ph >: T <: T1](other: T1): Boolean = x == other } class A |