diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-10-03 00:54:32 -0700 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-10-03 00:54:32 -0700 |
| commit | b17619dd071c65925b1073b8470a33711f8aa9a5 (patch) | |
| tree | f8d2b89d704646ab25114a65dfb5596c6a22ee02 /src/compiler/scala/tools/nsc/util | |
| parent | 8aae23ed47c4e38a465ff3373392484ca82473d1 (diff) | |
| parent | 59ba77519476b9ac7f420a6e23ddb8dd5b3d5608 (diff) | |
| download | scala-b17619dd071c65925b1073b8470a33711f8aa9a5.tar.gz scala-b17619dd071c65925b1073b8470a33711f8aa9a5.tar.bz2 scala-b17619dd071c65925b1073b8470a33711f8aa9a5.zip | |
Merge pull request #2977 from sjrd/topic/remove-classpath-logic-dependent-on-inline
Don't avoid to load trait impl .class without inliner.
Diffstat (limited to 'src/compiler/scala/tools/nsc/util')
| -rw-r--r-- | src/compiler/scala/tools/nsc/util/ClassPath.scala | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/util/ClassPath.scala b/src/compiler/scala/tools/nsc/util/ClassPath.scala index 8beca86a25..d2ba61cc0b 100644 --- a/src/compiler/scala/tools/nsc/util/ClassPath.scala +++ b/src/compiler/scala/tools/nsc/util/ClassPath.scala @@ -144,9 +144,7 @@ object ClassPath { def newClassPath(dir: AbstractFile) = new DirectoryClassPath(dir, this) } - object DefaultJavaContext extends JavaContext { - override def isValidName(name: String) = !ReflectionUtils.scalacShouldntLoadClassfile(name) - } + object DefaultJavaContext extends JavaContext private def endsClass(s: String) = s.length > 6 && s.substring(s.length - 6) == ".class" private def endsScala(s: String) = s.length > 6 && s.substring(s.length - 6) == ".scala" |