diff options
| author | Martin Odersky <odersky@gmail.com> | 2016-12-18 18:27:31 +0100 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2016-12-20 18:33:43 +0100 |
| commit | 11d8ed5d572504a7ba19d313cb909df20deae88f (patch) | |
| tree | 9a89c5d3899a2f00a509f7a58b3bc833d01bb086 /compiler/test/dotc | |
| parent | c38669928b577a1d08f7b19b80c979b7b7e957ad (diff) | |
| download | dotty-11d8ed5d572504a7ba19d313cb909df20deae88f.tar.gz dotty-11d8ed5d572504a7ba19d313cb909df20deae88f.tar.bz2 dotty-11d8ed5d572504a7ba19d313cb909df20deae88f.zip | |
Blacklist scala/util/Sorting.scala (reverted from commit b960b12887331744c9ecaeedc90054fc2e313230)
Diffstat (limited to 'compiler/test/dotc')
| -rw-r--r-- | compiler/test/dotc/scala-collections.blacklist | 4 | ||||
| -rw-r--r-- | compiler/test/dotc/scala-collections.whitelist | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/compiler/test/dotc/scala-collections.blacklist b/compiler/test/dotc/scala-collections.blacklist index 1e1c7b5d9..eb48d424a 100644 --- a/compiler/test/dotc/scala-collections.blacklist +++ b/compiler/test/dotc/scala-collections.blacklist @@ -211,5 +211,5 @@ # | result type of implicit definition needs to be given explicitly -../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))) +../scala-scala/src/library/scala/sys/SystemProperties.scala +# crashes on dotty.tools.dottydoc.TestWhitelistedCollections.arrayHasDocumentation diff --git a/compiler/test/dotc/scala-collections.whitelist b/compiler/test/dotc/scala-collections.whitelist index 498444ff5..1947e1f9f 100644 --- a/compiler/test/dotc/scala-collections.whitelist +++ b/compiler/test/dotc/scala-collections.whitelist @@ -297,6 +297,7 @@ ../scala-scala/src/library/scala/util/MurmurHash.scala ../scala-scala/src/library/scala/util/Properties.scala ../scala-scala/src/library/scala/util/Random.scala +../scala-scala/src/library/scala/util/Sorting.scala ../scala-scala/src/library/scala/collection/mutable/AnyRefMap.scala ../scala-scala/src/library/scala/collection/mutable/ArrayBuffer.scala |