Don't print underlying type of modules.

Since there is no useful information in such a message.

4 files changed, 5 insertions, 5 deletions

diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala
index fd75e42b61..9f5f7ffe61 100644
--- a/src/compiler/scala/reflect/internal/Types.scala
+++ b/src/compiler/scala/reflect/internal/Types.scala
@@ -893,7 +893,7 @@ trait Types extends api.Types { self: SymbolTable =>
     def toLongString = {
       val str = toString
       if (str == "type") widen.toString
-      else if (str endsWith ".type") str + " (with underlying type " + widen + ")"
+      else if ((str endsWith ".type") && !typeSymbol.isModuleClass) str + " (with underlying type " + widen + ")"
       else str
     }
 
diff --git a/test/files/neg/t414.check b/test/files/neg/t414.check
index d0d24baa33..e15dbaea71 100644
--- a/test/files/neg/t414.check
+++ b/test/files/neg/t414.check
@@ -1,5 +1,5 @@
 t414.scala:5: error: pattern type is incompatible with expected type;
- found   : Empty.type (with underlying type object Empty)
+ found   : Empty.type
  required: IntMap[a]
 Note: if you intended to match against the class, try `case _: Empty[_]` or `case Empty()`
                 case Empty =>
diff --git a/test/files/neg/t452.check b/test/files/neg/t452.check
index 85197af21b..aac663068e 100644
--- a/test/files/neg/t452.check
+++ b/test/files/neg/t452.check
@@ -1,5 +1,5 @@
 t452.scala:3: error: type mismatch;
- found   : Test.type (with underlying type object Test)
+ found   : Test.type
  required: Test.Foo
     def this() = this(this);
                       ^
diff --git a/test/files/neg/t4879.check b/test/files/neg/t4879.check
index 94758c751c..21cd329640 100644
--- a/test/files/neg/t4879.check
+++ b/test/files/neg/t4879.check
@@ -1,11 +1,11 @@
 t4879.scala:6: error: pattern type is incompatible with expected type;
- found   : C.type (with underlying type object C)
+ found   : C.type
  required: C
 Note: if you intended to match against the class, try `case _: C` or `case C(_)`
     case C  => true
          ^
 t4879.scala:10: error: pattern type is incompatible with expected type;
- found   : D.type (with underlying type object D)
+ found   : D.type
  required: D[T,U,V]
 Note: if you intended to match against the class, try `case _: D[_,_,_]` or `case D(_,_,_)`
     case D  => true