aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--compiler/test/dotc/scala-collections.blacklist11
-rw-r--r--compiler/test/dotc/scala-collections.whitelist2
-rw-r--r--doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala2
3 files changed, 2 insertions, 13 deletions
diff --git a/compiler/test/dotc/scala-collections.blacklist b/compiler/test/dotc/scala-collections.blacklist
index dc8d91c9a..3decba994 100644
--- a/compiler/test/dotc/scala-collections.blacklist
+++ b/compiler/test/dotc/scala-collections.blacklist
@@ -42,17 +42,6 @@
../scala-scala/src/library/scala/concurrent/package.scala
# -Ycheck:arrayConstructors failure
-
-
-
-
-## Errors involving dottydoc:
-
-../scala-scala/src/library/scala/sys/SystemProperties.scala
-# Test dotty.tools.dottydoc.TestWhitelistedCollections.arrayHasDocumentation failed
-
-
-
## Errors having to do with unavailable APIs or language features:
../scala-scala/src/library/scala/reflect/ClassManifestDeprecatedApis.scala
diff --git a/compiler/test/dotc/scala-collections.whitelist b/compiler/test/dotc/scala-collections.whitelist
index ce1093508..c7e5064b4 100644
--- a/compiler/test/dotc/scala-collections.whitelist
+++ b/compiler/test/dotc/scala-collections.whitelist
@@ -401,7 +401,7 @@
../scala-scala/src/library/scala/compat/Platform.scala
../scala-scala/src/library/scala/sys/package.scala
-#../scala-scala/src/library/scala/sys/SystemProperties.scala
+../scala-scala/src/library/scala/sys/SystemProperties.scala
../scala-scala/src/library/scala/sys/Prop.scala
../scala-scala/src/library/scala/sys/PropImpl.scala
../scala-scala/src/library/scala/sys/BooleanProp.scala
diff --git a/doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala b/doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala
index 43b679c71..483c22984 100644
--- a/doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/core/DocASTPhase.scala
@@ -46,7 +46,7 @@ class DocASTPhase extends Phase {
def membersFromSymbol(sym: Symbol): List[Entity] = {
if (sym.info ne NoType) {
- val defs = sym.info.bounds.hi.membersBasedOnFlags(Flags.Method, Flags.Synthetic | Flags.Private)
+ val defs = sym.info.bounds.hi.finalResultType.membersBasedOnFlags(Flags.Method, Flags.Synthetic | Flags.Private)
.filterNot(_.symbol.owner.name.show == "Any")
.map { meth =>
DefImpl(