summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5642 from janekdb/topic/MB-calculation-correctionAdriaan Moors2017-02-071-1/+1
|\ | | | | Calculate MB instead of MiB
| * Calculate MB instead of MiBJanek Bogucki2017-01-151-1/+1
| | | | | | | | This is consistent with same calculation in Compilers.freeMemoryString.
* | Merge pull request #5628 from martijnhoekstra/walkfilterdocAdriaan Moors2017-02-071-6/+7
|\ \ | | | | | | fix doc for walkfilter and walk
| * | fix doc for walkfilter and walkMartijn Hoekstra2017-01-051-6/+7
| | |
* | | Merge pull request #5673 from retronym/topic/hashmap-containsAdriaan Moors2017-02-074-10/+128
|\ \ \ | | | | | | | | Optimizations in immutable.Map.{get, contains}
| * | | Fix copy/pasto references to mutable package in benchmarkJason Zaugg2017-02-031-3/+1
| | | |
| * | | Optimizations in immutable.Map.{get, contains}Jason Zaugg2017-02-033-10/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Avoid allocation of Some in get - defer integer left shift until needed - avoid redundantly masking an integer before: Benchmark (size) Mode Cnt Score Error Units HashMapBenchmark.contains 10 avgt 20 284.624 ± 18.985 ns/op HashMapBenchmark.contains 100 avgt 20 3190.580 ± 33.622 ns/op HashMapBenchmark.contains 1000 avgt 20 52967.171 ± 1524.834 ns/op HashMapBenchmark.get 10 avgt 20 248.168 ± 2.612 ns/op HashMapBenchmark.get 100 avgt 20 2795.469 ± 54.458 ns/op HashMapBenchmark.get 1000 avgt 20 52238.773 ± 1268.764 ns/op after: Benchmark (size) Mode Cnt Score Error Units HashMapBenchmark.contains 10 avgt 20 195.107 ± 2.442 ns/op HashMapBenchmark.contains 100 avgt 20 2454.151 ± 24.392 ns/op HashMapBenchmark.contains 1000 avgt 20 40722.993 ± 520.473 ns/op HashMapBenchmark.get 10 avgt 20 245.282 ± 3.547 ns/op HashMapBenchmark.get 100 avgt 20 2729.669 ± 32.767 ns/op HashMapBenchmark.get 1000 avgt 20 49568.410 ± 794.565 ns/op
| * | | Benchmark for immutable.HashMap.{get, contains}Jason Zaugg2017-02-031-0/+58
| | | |
* | | | Merge pull request #5625 from gourlaysama/parser-combinators-version-bumpAdriaan Moors2017-02-071-1/+1
|\ \ \ \ | | | | | | | | | | Update to scala-parser-combinators v1.0.5
| * | | | Update to scala-parser-combinators v1.0.5Antoine Gourlay2017-01-041-1/+1
| | | | |
* | | | | Merge pull request #5585 from som-snytt/issue/10097Adriaan Moors2017-02-0721-35/+122
|\ \ \ \ \ | | | | | | | | | | | | SI-10097 Error if no non-implicit case class param
| * | | | | SI-10097 Adapt unless -Xsource:2.13Som Snytt2016-12-1410-6/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For 2.12 migration, insert missing case class param section, strip caseaccessor from implicit paramsection, and deprecate the adaptation.
| * | | | | SI-8704 Also warn if effectively multiple implicitSom Snytt2016-12-145-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current semantics are that leading implicit param turns the parameter section into an implicit section (though without making other params implicitly implicit). Warn if more than one head of a param section is implicit, since that results in multiple implicit param sections.
| * | | | | SI-8704 Error on bad implicit sectionsSom Snytt2016-12-145-16/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of aborting when a class def has extra parameter section, take all parameter sections and sanity check the use of leading implicit to indicate an implicit parameter section.
| * | | | | SI-10097 Error if no non-implicit case class paramSom Snytt2016-12-1410-23/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Case class must have a non-implicit param list. Error early, error often. Also update spec to say that class implicitly gets a non-implicit parameter section if it doesn't have one, and that a case class must have one.
* | | | | | Merge pull request #5579 from edmundnoble/queue-concatAdriaan Moors2017-02-072-1/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve Queue.++ when building another Queue
| * | | | | | Improve Queue.++ when building another QueueEdmund Noble2017-01-182-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use reverse_:::
* | | | | | | Merge pull request #5665 from som-snytt/issue/8662-file-completeAdriaan Moors2017-02-072-56/+141
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | SI-8662 Repl completions
| * | | | | | | SI-8662 Repl completionsSom Snytt2017-01-282-56/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support command completions with a completer that delegates to a colon command completer, which either completes the command or completes a filename.
* | | | | | | | Merge pull request #5666 from Philippus/issue/10030Lukas Rytz2017-02-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-10030 - added quotes in case the path contains a space and an 8.3-…
| * | | | | | | | SI-10030 - added quotes in case the path contains a space and an ↵Philippus Baalman2017-01-301-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | 8.3-compliant path is not available
* | | | | | | | Merge pull request #5667 from som-snytt/issue/maxerrsLukas Rytz2017-02-039-8/+109
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | SI-9729 -Xmaxerrs to limit messages
| * | | | | | | SI-9729 -Xmaxerrs to limit messagesSom Snytt2017-01-319-8/+109
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 2.7.2, console reporter has limited error messages to a fixed 100. Use `-Xmaxerrs -Xmaxwarns` as from `javac` to configure.
* | | | | | | Merge pull request #5668 from dwijnand/failblogSeth Tisue2017-02-011-24/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Finish resolving conflicts from rebasing commits within #5661
| * | | | | | | Finish resolving conflicts from rebasing commits within #5661Dale Wijnand2017-02-011-24/+0
|/ / / / / / /
* | | | | | | Merge pull request #5661 from SethTisue/direct-scalacheckJason Zaugg2017-01-30108-1198/+1278
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | run ScalaCheck tests directly, not through partest
| * | | | | | Update IntelliJ template configurationJason Zaugg2017-01-279-106/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove obsolete references to subproject for actors, forkjoin - Add a new subproject for the scalacheck suite, as spawned in the previous commit
| * | | | | | Move scalacheck test suite sources to folders corresponding packagingJason Zaugg2017-01-2741-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also moves some tests into suitable packaging.
| * | | | | | Move Scaladoc's Partest base classes to partest-extrasJason Zaugg2017-01-273-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They exist in the current location for historical reasons. partest-extras is a cleaner home for them, as we can avoid the dependency of the scaladoc project on partest.
| * | | | | | run ScalaCheck tests directly, not through partestSeth Tisue2017-01-2776-1039/+917
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ScalaCheck ever being under partest in the first place is ancient history, from back in the Ant build days (shudder) ScalaCheck support was removed from partest 1.1.0, which we already upgraded to in a recent commit also upgrades ScalaCheck from 1.11.6 to 1.13.4, since we might as well. no source changes were necessary.
| * | | | | | adjust to partest 1.1.0's new mixed Java/Scala compilationLukas Rytz2017-01-2724-55/+67
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upgrades partest from 1.0.17 to 1.1.0 https://github.com/scala/scala-partest/pull/69 changed the mode for mixed compilation, which used to be 1. scalac *.java *.scala -d o 2. javac *.java -d o -cp o 3. scalac *.scala -d o -cp o Now the third step is skipped. This required some adjustments to existing tests. - t7014 is split in two groups, the fix is for separate compilation. - t7582 is also split. It tests inliner warnings when inling code that accesses Java-defined package-private code. Inlining from Java only works in separate compilation (no bytecode available in mixed compilation). - Java compiler warnings of "run" tests were not reported in the old scheme, now they are. Deprecation / unchecked warnings were removed from t6240, t8786, varargs. - t4788 required a .check file update to pass, which hints at a bug. I will re-open SI-4788 and investigate later.
* | | | | | Merge pull request #5651 from rorygraves/2.12.x_symbol_markingJason Zaugg2017-01-201-3/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve performance of Symbol marking
| * | | | | | Improve performance of Symbol markingRory Graves2017-01-161-3/+9
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #5637 from ichaki5748/Sl-10113Seth Tisue2017-01-183-0/+57
|\ \ \ \ \ \ | |/ / / / / |/| | | | | SI-10113 mutable.TreeMap.range does not work
| * | | | | SI-10113 mutable.TreeMap.range does not workEvgeny Slutsky2017-01-093-0/+57
| | |_|_|/ | |/| | | | | | | | | | | | | added missing overrides for TreeMapView
* | | | | Merge pull request #5636 from adriaanm/jline-2.14.3-2.12.xAdriaan Moors2017-01-103-16/+8
|\ \ \ \ \ | |/ / / / |/| | | | Upgrade to jline2 2.14.3
| * | | | Revert "Repl prints '\n' as newline, not "^J""Adriaan Moors2017-01-091-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d571fa07 (#5450). Superseded by upgrade to jline2 2.14.3 (jline/jline2@01969b5)
| * | | | Upgrade to jline2 2.14.3Adriaan Moors2017-01-092-6/+6
|/ / / /
* | | | Merge pull request #5621 from som-snytt/issue/9936-moreLukas Rytz2017-01-034-4/+22
|\ \ \ \ | | | | | | | | | | SI-9936 LinearSeqOptimized.indexWhere
| * | | | SI-9936 LinearSeqOptimized.indexWhereSom Snytt2016-12-304-4/+22
|/ / / / | | | | | | | | | | | | | | | | | | | | Also suffered from the negative `from` bug. Prefer `math.max` to avoid `RichInt`.
* | | | Merge pull request #5607 from adriaanm/rebase-5551Adriaan Moors2016-12-213-0/+65
|\ \ \ \ | | | | | | | | | | Override equals and hashCode for WrappedArray
| * | | | Override equals and hashCode for WrappedArrayAlexey Romanov2016-12-213-0/+65
| | | | |
* | | | | Merge pull request #5583 from lrytz/t10093Adriaan Moors2016-12-215-8/+52
|\ \ \ \ \ | | | | | | | | | | | | SI-10093 don't move member traits to constructor body in constructors
| * | | | | SI-10093 don't move member traits to constructor body in constructorsLukas Rytz2016-12-065-8/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression introduced in c8e6050. Member traits with only abstract definitions (`isInterface`) were moved into the primary constructor by mistake. (Flatten moved the classes back.) The member trait was duplicated into the constructor of specialized subclasses, causing it to be generated multiple times. Also removes some unnecessary `isMixinConstructor` checks: the mixin constructor is always the primary constructor. This commit also clarifies (and tests) what `isInterface` means: for scala-defined traits, it means there are only abstract members. For java-defined interfaces, it is always true.
* | | | | | Merge pull request #5610 from dwijnand/sbtLukas Rytz2016-12-2116-22/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix how "sbt" is written
| * | | | | | Fix how "sbt" is writtenDale Wijnand2016-12-2116-22/+22
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "sbt" is not an acronym (it used to be, but it isn't any longer). It's a proper name, like "iPhone" or "eBay". So, just like you wouldn't write "Get Started With EBay" or "How To Reset Your IPhone", we don't write "Using the Sbt Build".
* | | | | | Merge pull request #5608 from retronym/merge/2.11.x-to-2.12.x-20161220Lukas Rytz2016-12-2036-58/+474
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merge 2.11.x to 2.12.x [ci: last-only]
| * \ \ \ \ \ Merge remote-tracking branch 'origin/2.11.x' into ↵Jason Zaugg2016-12-2036-58/+474
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge/2.11.x-to-2.12.x-20161220 Conflicts: bincompat-backward.whitelist.conf build.xml src/compiler/scala/tools/nsc/typechecker/Typers.scala src/library/scala/collection/immutable/NumericRange.scala
| | * | | | | Merge pull request #5605 from szeiger/wip/fix-07-linksAdriaan Moors2016-12-192-4/+4
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Fix spec links to `07-implicits.html`
| | | * | | | | Fix spec links to `07-implicits.html`Stefan Zeiger2016-12-182-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file referenced by the current links actually exists under http://www.scala-lang.org/files/archive/spec/2.11/ but with a different design than the rest. It seems to be left over from an older version.
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-23 00:27:41 +0000