diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2016-12-19 13:38:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-19 13:38:36 +0100 |
commit | c657bbfa18b052245d662d0136c3b90df5bfcc78 (patch) | |
tree | 94b624fe657925b97ddbb7f474495d483ee49393 /compiler | |
parent | 52c869ca7aa5a3fdaf2e48bd6d64097b10a28240 (diff) | |
parent | 6dd758eb603518272c4b8d58816d753db718d952 (diff) | |
download | dotty-c657bbfa18b052245d662d0136c3b90df5bfcc78.tar.gz dotty-c657bbfa18b052245d662d0136c3b90df5bfcc78.tar.bz2 dotty-c657bbfa18b052245d662d0136c3b90df5bfcc78.zip |
Merge pull request #1829 from dotty-staging/fix-#1794
Fix #1794: handle TermRef result types in dottydoc
Diffstat (limited to 'compiler')
-rw-r--r-- | compiler/test/dotc/scala-collections.blacklist | 3 | ||||
-rw-r--r-- | compiler/test/dotc/scala-collections.whitelist | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/compiler/test/dotc/scala-collections.blacklist b/compiler/test/dotc/scala-collections.blacklist index 407cb0a4b..f7744401a 100644 --- a/compiler/test/dotc/scala-collections.blacklist +++ b/compiler/test/dotc/scala-collections.blacklist @@ -222,8 +222,5 @@ # | result type of implicit definition needs to be given explicitly -../scala-scala/src/library/scala/sys/SystemProperties.scala -# crashes on dotty.tools.dottydoc.TestWhitelistedCollections.arrayHasDocumentation - ../scala-scala/src/library/scala/util/Sorting.scala # assertion failed: invalid prefix ImplicitMethodType(List(ord), List(RefinedType(TypeRef(ThisType(TypeRef(NoPrefix,math)),Ordering), scala$math$Ordering$$T, TypeAlias(TypeRef(NoPrefix,K), 0))), RefinedType(TypeRef(ThisType(TypeRef(NoPrefix,math)),Ordering), scala$math$Ordering$$T, TypeAlias(TypeRef(NoPrefix,K), 0))) diff --git a/compiler/test/dotc/scala-collections.whitelist b/compiler/test/dotc/scala-collections.whitelist index c5d6cd2a1..33c8e22f0 100644 --- a/compiler/test/dotc/scala-collections.whitelist +++ b/compiler/test/dotc/scala-collections.whitelist @@ -386,6 +386,7 @@ ../scala-scala/src/library/scala/compat/Platform.scala +../scala-scala/src/library/scala/sys/SystemProperties.scala ../scala-scala/src/library/scala/sys/package.scala ../scala-scala/src/library/scala/sys/Prop.scala ../scala-scala/src/library/scala/sys/PropImpl.scala |