summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix typo in the docs for the ++ method of StreamMarkus Hauck2016-03-311-1/+1
|
* Merge pull request #5066 from acjay/cleanup_scaladoc_hoverAdriaan Moors2016-03-301-3/+3
|\ | | | | minor style updates for Scaladoc formatting
| * minor style updates for Scaladoc formattingAlan Johnson2016-03-281-3/+3
| | | | | | | | | | - lighten hover highlight color for higher text/background contrast - adjust border-left for div.members to prevent content shifts on-hover
* | Merge pull request #5033 from szeiger/issue/9623-2.12Adriaan Moors2016-03-301-44/+46
|\ \ | | | | | | Replace JoinIterator & improve ConcatIterator
| * | Replace JoinIterator & improve ConcatIteratorStefan Zeiger2016-03-111-44/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new `ConcatIterator` requires only one extra lightweight wrapper object (cons cell) to be allocated compared to `JoinIterator`. All additional concatenations are then done in place with one cons cell per appended iterator. Running 1000000 iterations of the following benchmark for LHS recursion: ``` def lhs(n: Int) = (1 to n).foldLeft(Iterator.empty: Iterator[Int])((res, _) => res ++ Iterator(1)).sum ``` On 2.12.x before SI-9623 fix: ``` $ ../scala/build-sbt/quick/bin/scala -J-Xmx1024M -nc concatit.scala 1000000: 555ms 1000000: 344ms 1000000: 397ms 1000000: 309ms 1000000: 290ms 1000000: 283ms 1000000: 282ms 1000000: 281ms 1000000: 290ms 1000000: 279ms ``` With SI-9623 fix: ``` $ ../scala/build-sbt/quick/bin/scala -J-Xmx1024M -nc concatit.scala 1000000: 610ms 1000000: 324ms 1000000: 387ms 1000000: 315ms 1000000: 296ms 1000000: 300ms 1000000: 341ms 1000000: 294ms 1000000: 291ms 1000000: 281ms ``` With this version: ``` $ ../scala/build-sbt/quick/bin/scala -J-Xmx1024M -nc concatit.scala 1000000: 362ms 1000000: 162ms 1000000: 140ms 1000000: 150ms 1000000: 110ms 1000000: 57ms 1000000: 79ms 1000000: 109ms 1000000: 120ms 1000000: 49ms ``` And for RHS recursion: ``` def rhs(n: Int) = (1 to n).foldLeft(Iterator.empty: Iterator[Int])((res, _) => Iterator(1) ++ res).sum ``` On 2.12.x before SI-9623 fix: ``` StackOverflowError ``` With SI-9623 fix: ``` StackOverflowError ``` With this version: ``` $ ../scala/build-sbt/quick/bin/scala -J-Xmx1024M -nc concatit.scala 1000000: 3156ms 1000000: 1536ms 1000000: 1240ms 1000000: 1575ms 1000000: 439ms 1000000: 706ms 1000000: 1043ms 1000000: 1211ms 1000000: 515ms 1000000: 314ms ```
* | | Merge pull request #5062 from felixmulder/topic/scaladoc-search-historySeth Tisue2016-03-301-0/+24
|\ \ \ | | | | | | | | Add back to search for Scaladoc
| * | | Add search history for ScaladocFelix Mulder2016-03-301-0/+24
| | | |
* | | | Merge pull request #5069 from ↵Vlad Ureche2016-03-302-14/+29
|\ \ \ \ | |/ / / |/| | | | | | | | | | | felixmulder/topic/scaladoc-search-types-and-classes Add type and class/trait member search, fixes SI-9721 and SI-9722
| * | | Add type and class/trait member search, fixes SI-9721 and SI-9722Felix Mulder2016-03-302-14/+29
|/ / /
* | | Merge pull request #5058 from lrytz/newTraitsInlinerLukas Rytz2016-03-307-61/+58
|\ \ \ | | | | | | | | Inline super calls, as they are statically resolved
| * | | Inline super calls, as they are statically resolvedLukas Rytz2016-03-237-61/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensures that mixin methods of `@inline` annotated concrete trait methods inline the trait method. Fixes https://github.com/scala/scala-dev/issues/86
* | | | Merge pull request #5060 from scala/DarkDimius-patch-1Lukas Rytz2016-03-291-2/+2
|\ \ \ \ | | | | | | | | | | Fix a bug in multi-dimensional array creation
| * | | | Fix a bug in multi-dimensional array creationDmitry Petrashko2016-03-231-2/+2
| |/ / / | | | | | | | | | | | | | | | | `']' * 5` is not `]]]]]` but `245`. I guess this code is never executed, because it would never work.
* | | | Merge pull request #5008 from janekdb/2.12.x-remove-Predef-errorSeth Tisue2016-03-293-9/+3
|\ \ \ \ | | | | | | | | | | Remove deprecated Predef.error
| * | | | Remove deprecated Predef.errorJanek Bogucki2016-03-263-9/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | error was deprecated in 2.9.0 but remained to ensure compatibility with sbt. This changes follows on from an update to the latest sbt version (0.13.11).
* | | | Merge pull request #5021 from szeiger/wip/remove-deprecationsSeth Tisue2016-03-2920-250/+216
|\ \ \ \ | |/ / / |/| | | Seal collection classes that were annotated with deprecatedInheritance in 2.11.0
| * | | Make some collection classes final or sealedStefan Zeiger2016-03-2318-249/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | They were all annotated with `@deprecatedInheritance` in 2.11.0. Some deprecated classes are moved to new source files in order to seal the parent class. The package-private class `DoublingUnrolledBuffer` is moved from `scala.collection.parallel.mutable` to `scala.collection.mutable` in order to seal `UnrolledBuffer`.
| * | | Add a `genprod` command to the sbt buildStefan Zeiger2016-03-172-1/+10
| | | |
* | | | Merge pull request #5050 from code-star/topic/2.12.x-scaladoc-Auto-expandVlad Ureche2016-03-252-26/+31
|\ \ \ \ | | | | | | | | | | Fix scaladoc scroll and auto-expand on permalinks
| * | | | scaladoc fix permalinksDavid Hoepelman2016-03-251-25/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Member description auto-expands * If member comes from implicits is now becomes visible * Member is no longer hidden by search bar after scrolling * Permalink button now works when member is in a group (scrolling is still broken)
| * | | | Fixed Typo in scaladoc scheduler.jsPim Verkerk2016-03-251-1/+1
|/ / / /
* | | | Merge pull request #5055 from lrytz/merge-2.11-to-2.12-mar-21Adriaan Moors2016-03-2327-230/+533
|\ \ \ \ | | | | | | | | | | Merge 2.11 to 2.12
| * \ \ \ Merge commit '1fcfdd8' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-231-29/+33
| |\ \ \ \
| | * \ \ \ Merge pull request #5054 from lrytz/intellij-2.112.11.xLukas Rytz2016-03-2327-236/+507
| | |\ \ \ \ | | | | | | | | | | | | | | Update IntelliJ build for use with sbt
| | | * | | | Cleanup IntelliJ integration based on review feedbackLukas Rytz2016-03-221-31/+35
| | | | | | |
| * | | | | | Merge commit '4ef1429' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-230-0/+0
| |\| | | | |
| | * | | | | Merge pull request #5056 from viktorklang/wip-SI9488-Future.toString-√Lukas Rytz2016-03-234-2/+34
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | SI-9488 - adds the same default toString format to Scala Futures as 2…
| | | * | | | | SI-9488 - adds the same default toString format to Scala Futures as 2.12.xViktor Klang2016-03-224-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes tests to verify the toString representations.
| | * | | | | | Merge pull request #5026 from SethTisue/scala-xml-version-bumpLukas Rytz2016-03-221-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | upgrade to latest scala-xml (namely 1.0.5)
| | | * | | | | Merge branch '2.11.x' into scala-xml-version-bumpSeth Tisue2016-03-094-5/+5
| | | |\ \ \ \ \
| | | * | | | | | upgrade to latest scala-xml (namely 1.0.5)Seth Tisue2016-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there shouldn't be user-visible changes since 1.0.4, but regardless, it's good to depend on the latest
| * | | | | | | | Updates to IntelliJ files for 2.12.xLukas Rytz2016-03-213-34/+41
| | | | | | | | |
| * | | | | | | | Merge commit '5f5cc18' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-2127-230/+522
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Update IntelliJ build for use with sbtLukas Rytz2016-03-2127-236/+503
| | |/ / / / / /
| * | | | | | | Merge commit 'afb1458' into merge-2.11-to-2.12-mar-21Lukas Rytz2016-03-210-0/+0
| |\| | | | | |
| | * | | | | | Merge pull request #5030 from SethTisue/newer-akkaAdriaan Moors2016-03-151-1/+1
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | bundle a newer Akka actors jar
| | | * | | | | Merge branch '2.11.x' into newer-akkaSeth Tisue2016-03-094-5/+5
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | bundle a newer Akka actors jarSeth Tisue2016-03-091-1/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | might as well let people have the current stuff. I asked the Akka folks and nobody saw a reason not to upgrade. this version of Akka is the latest in the 2.3.x series, but is also some months old, so no stability worries. (this would have been included in 2.11.8 if I had thought of it in time)
* | | | | | | Merge pull request #5051 from kmizu/improve-api-docsAdriaan Moors2016-03-231-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve documentation of `GenSeqLike#length`
| * | | | | | | Add scaladoc comment about the case when Exception will be thrown by ↵Kota Mizushima2016-03-241-0/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | invocation of length method
* | | | | | | Merge pull request #5053 from som-snytt/issue/9314Lukas Rytz2016-03-233-20/+57
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | SI-9314 Marginal edge case to warn-missing-interp
| * | | | | | SI-9314 No warn on ${nonid}Som Snytt2016-03-233-13/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the sym test on an expr that happens to be a subset of idents and is not in scope. Other `${ operator_* }` warn.
| * | | | | | SI-9314 Ignore "${}"Som Snytt2016-03-202-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As an Easter egg, let "${} $x" forego the check on `x`. In other words, empty expression interpolation looks too degenerate to check.
| * | | | | | SI-9314 Don't warn on "$pkg"Som Snytt2016-03-203-9/+19
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Edge cases of things not to warn about include package names.
* | | | | | Merge pull request #5057 from lrytz/flatClasspathLukas Rytz2016-03-2318-230/+384
|\ \ \ \ \ \ | | | | | | | | | | | | | | Enable -YclasspathImpl:flat by default
| * | | | | | Support :require when using the flat classpath representation.Lukas Rytz2016-03-229-110/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :require was re-incarnated in https://github.com/scala/scala/pull/4051, it seems to be used by the spark repl. This commit makes it work when using the flat classpath representation.
| * | | | | | Enable flat classpath by defaultLukas Rytz2016-03-2210-120/+163
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements VirtualDirectoryFlatClassPath, which is required for the presentation compiler created for the repl's tab-completion. Various minor cleanups in the flat classpath implementation.
* | | | | | Merge pull request #5047 from kmizu/resolve-several-warningsAdriaan Moors2016-03-226-12/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Resolve several deprecation warnings
| * | | | | | Resolve warnings related to SyncVar#setKota Mizushima2016-03-183-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace it with SyncVar#put
| * | | | | | * Replace isPackage with hasPackageFlagKota Mizushima2016-03-172-2/+2
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 20:14:38 +0000