aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/Types.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2015-12-10 15:37:37 +0100
committerMartin Odersky <odersky@gmail.com>2015-12-14 14:30:09 +0100
commit3476bab33e9509963fd02aab10b4db3b891c9a85 (patch)
tree44ed2633e7af264f4980b387422eeb05d3ff2504 /src/dotty/tools/dotc/core/Types.scala
parentc4238b13b3eb89abeac49aa814313c9adc75599c (diff)
downloaddotty-3476bab33e9509963fd02aab10b4db3b891c9a85.tar.gz
dotty-3476bab33e9509963fd02aab10b4db3b891c9a85.tar.bz2
dotty-3476bab33e9509963fd02aab10b4db3b891c9a85.zip
Better diagnostics for clashing classes
We do not allow same-named class members in supertraits of a mixin composition anymore. This commit gives a better error message and avoids a crash in RefChecks.
Diffstat (limited to 'src/dotty/tools/dotc/core/Types.scala')
-rw-r--r--src/dotty/tools/dotc/core/Types.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/core/Types.scala b/src/dotty/tools/dotc/core/Types.scala
index 159e776b4..0691d979a 100644
--- a/src/dotty/tools/dotc/core/Types.scala
+++ b/src/dotty/tools/dotc/core/Types.scala
@@ -3318,7 +3318,7 @@ object Types {
}
}
- class MergeError(msg: String) extends TypeError(msg)
+ class MergeError(msg: String, val tp1: Type, val tp2: Type) extends TypeError(msg)
// ----- Debug ---------------------------------------------------------