aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/typer
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2013-11-20 15:06:12 +0100
committerMartin Odersky <odersky@gmail.com>2013-11-20 15:06:12 +0100
commit5240de72c9cc0beb552dc1fd77510b3d7b19a8c6 (patch)
treefbd652d601f647f6788bb15a02f6d8216a70083c /src/dotty/tools/dotc/typer
parentdb5066bbb4c281bd3b65fe6422314afee115de5e (diff)
downloaddotty-5240de72c9cc0beb552dc1fd77510b3d7b19a8c6.tar.gz
dotty-5240de72c9cc0beb552dc1fd77510b3d7b19a8c6.tar.bz2
dotty-5240de72c9cc0beb552dc1fd77510b3d7b19a8c6.zip
Splitting constraint.appky into at, bounds, contains.
Motivation: Keep usages separate, prepare for larger constraint refactoring.
Diffstat (limited to 'src/dotty/tools/dotc/typer')
-rw-r--r--src/dotty/tools/dotc/typer/Inferencing.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/typer/Inferencing.scala b/src/dotty/tools/dotc/typer/Inferencing.scala
index eb88c0764..a364d0f3d 100644
--- a/src/dotty/tools/dotc/typer/Inferencing.scala
+++ b/src/dotty/tools/dotc/typer/Inferencing.scala
@@ -259,8 +259,8 @@ object Inferencing {
if (v == 1) tvar.instantiate(fromBelow = false)
else if (v == -1) tvar.instantiate(fromBelow = true)
else {
- val bounds @ TypeBounds(lo, hi) = ctx.typerState.constraint(tvar.origin)
- if (!(hi <:< lo)) result = Some(tvar)
+ val bounds = ctx.typerState.constraint.bounds(tvar.origin)
+ if (!(bounds.hi <:< bounds.lo)) result = Some(tvar)
tvar.instantiate(fromBelow = false)
}
result