diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-05-01 11:42:55 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-05-01 11:42:55 +0200 |
| commit | faa32647ac69305dd2b111ca18b3f7fa2b948a49 (patch) | |
| tree | e17631be330ae74b872e53a979dc83691f4f4796 /test/files/jvm/javaReflection/Test.scala | |
| parent | 00b5adfbf3618639b501d1859f7a023083a4b8c3 (diff) | |
| parent | e596d1a65d81a81a54847d90d2d90be3ffbb3d92 (diff) | |
| download | scala-faa32647ac69305dd2b111ca18b3f7fa2b948a49.tar.gz scala-faa32647ac69305dd2b111ca18b3f7fa2b948a49.tar.bz2 scala-faa32647ac69305dd2b111ca18b3f7fa2b948a49.zip | |
Merge pull request #4480 from retronym/merge/2.11.x-to-2.12.x-20150501
Merge 2.11.x to 2.12.x [ci: last-only]
Diffstat (limited to 'test/files/jvm/javaReflection/Test.scala')
| -rw-r--r-- | test/files/jvm/javaReflection/Test.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/jvm/javaReflection/Test.scala b/test/files/jvm/javaReflection/Test.scala index 5b6ef1b573..ae5a36eeb2 100644 --- a/test/files/jvm/javaReflection/Test.scala +++ b/test/files/jvm/javaReflection/Test.scala @@ -124,8 +124,8 @@ object Test { // exclude files from Test.scala, just take those from Classes_1.scala case s if !s.startsWith("Test") && s.endsWith(".class") => s.substring(0, s.length - 6) }).sortWith((a, b) => { - // sort such that first there are all anonymous funcitions, then all other classes. - // within those cathegories, sort lexically. + // sort such that first there are all anonymous functions, then all other classes. + // within those categories, sort lexically. // this makes the check file smaller: it differs for anonymous functions between -Ydelambdafy:inline/method. // the other classes are the same. if (isAnonFunClassName(a)) !isAnonFunClassName(b) || a < b |