diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-08-19 09:42:44 +1000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-08-23 15:51:52 -0700 |
| commit | 2f73bcc56e0ea8d0124ce52beb9aa9c68f245a53 (patch) | |
| tree | 929aa6a79970b45680562e742ba13972df61e1d0 | |
| parent | 10aa78db5961284e0f4fb2fcb5a1f3bd7c357385 (diff) | |
| download | scala-2f73bcc56e0ea8d0124ce52beb9aa9c68f245a53.tar.gz scala-2f73bcc56e0ea8d0124ce52beb9aa9c68f245a53.tar.bz2 scala-2f73bcc56e0ea8d0124ce52beb9aa9c68f245a53.zip | |
Minor changes after review
| -rw-r--r-- | src/compiler/scala/tools/nsc/classpath/DirectoryClassPath.scala | 2 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/tpe/TypeMaps.scala | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/classpath/DirectoryClassPath.scala b/src/compiler/scala/tools/nsc/classpath/DirectoryClassPath.scala index 0d6925e8ac..c4be59d7eb 100644 --- a/src/compiler/scala/tools/nsc/classpath/DirectoryClassPath.scala +++ b/src/compiler/scala/tools/nsc/classpath/DirectoryClassPath.scala @@ -101,7 +101,7 @@ trait JFileDirectoryLookup[FileEntryType <: ClassRepresentation] extends Directo // with the same base type depth. // // Notably, this will stably infer`Product with Serializable` - // as the type of `ase class C(); case class D(); List(C(), D()).head`, rather than the opposite order. + // as the type of `case class C(); case class D(); List(C(), D()).head`, rather than the opposite order. // On Mac, the HFS performs this sorting transparently, but on Linux the order is unspecified. // // Note this behaviour can be enabled with in javac with `javac -XDsortfiles`, but that's only diff --git a/src/reflect/scala/reflect/internal/tpe/TypeMaps.scala b/src/reflect/scala/reflect/internal/tpe/TypeMaps.scala index df61d2e418..ba4f2bec4b 100644 --- a/src/reflect/scala/reflect/internal/tpe/TypeMaps.scala +++ b/src/reflect/scala/reflect/internal/tpe/TypeMaps.scala @@ -614,12 +614,12 @@ private[internal] trait TypeMaps { val pre1 = pre match { case tv: TypeVar => // Needed with existentials in prefixes, e.g. test/files/pos/typevar-in-prefix.scala - // Perhaps the base type sequence of a type var should include it bounds? + // Perhaps the base type sequence of a type var should include its bounds? tv.origin case _ => pre } // widen needed (at least) because of https://github.com/scala/scala-dev/issues/166 - (clazz == candidate) && ( + ( if (clazz.isRefinementClass) // base type seqs of aliases over refinement types have copied refinement types based on beta reduction // for reliable lookup we need to consult the base type of the type symbol. (example: pos/t8177b.scala) |