summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5040 from adriaanm/rebase-5031Jason Zaugg2016-03-1516-118/+198
|\ | | | | Merge 2.11.x into 2.12.x [ci: last-only]
| * Skip merging 2.11.x's #5025 into 2.12.xAdriaan Moors2016-03-140-0/+0
| |\
| | * Merge pull request #5025 from SethTisue/next-is-2-11-9Seth Tisue2016-03-094-5/+5
| | |\ | | | | | | | | bump versions after 2.11.8 release
| | | * bump versions after 2.11.8 releaseSeth Tisue2016-03-084-5/+5
| | |/
| * | Merge 2.11.x into 2.12.xAdriaan Moors2016-03-1413-70/+150
| |\| | | | | | | | | | Resolved conflicts as in b0e05b67c7
| | * Merge pull request #5005 from janekdb/2.11.x-man-page-scalacv2.11.8Seth Tisue2016-03-041-25/+26
| | |\ | | | | | | | | Document -Xxml:coalescing in scalac man page
| | | * Document -Xxml:coalescing in scalac man pageJanek Bogucki2016-03-031-25/+26
| | | | | | | | | | | | | | | | The formatting style is based on -g and -target.
| | * | Merge pull request #4994 from dk14/patch-1Seth Tisue2016-03-041-1/+1
| | |\ \ | | | | | | | | | | explicitly specify insertion-order feature in docs
| | | * | explicitly specify insertion-order feature in docsdk142016-02-231-1/+1
| | | | |
| | * | | Merge pull request #5006 from SethTisue/more-cowbell-more-lightbendSeth Tisue2016-03-045-6/+6
| | |\ \ \ | | | | | | | | | | | | Typesafe -> Lightbend in more places
| | | * | | Typesafe -> Lightbend in more placesSeth Tisue2016-03-045-6/+6
| | |/ / /
| | * | | Merge pull request #5002 from retronym/ticket/9546Lukas Rytz2016-03-046-29/+107
| | |\ \ \ | | | |_|/ | | |/| | SI-9546 Fix regression in rewrite of case apply to constructor call
| | | * | SI-9425 Fix a residual bug with multi-param-list case classesJason Zaugg2016-03-042-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During code review for the fix for SI-9546, we found a corner case in the SI-9425 that remained broken. Using `finalResultType` peels off all the constructor param lists, and solves that problem.
| | | * | SI-9546 Fix regression in rewrite of case apply to constructor callJason Zaugg2016-03-022-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In SI-9425, I disabled the rewrite of `CaseClass.apply(x)` to `new CaseClass(x)` if the constructor was was less accessible than the apply method. This solved a problem with spurious "constructor cannot be accessed" errors during refchecks for case classes with non-public constructors. However, for polymorphic case classes, refchecks was persistent, and even after refusing to transform the `TypeApply` within: CaseClass.apply[String]("") It *would* try again to transform the enclosing `Select`, a code path only intended for monomorphic case classes. The tree has a `PolyType`, which foiled the newly added accessibility check. I've modified the call to `isSimpleCaseApply` from the transform of `Select` nodes to exclude polymorphic apply's from being considered twice.
| | | * | Refactor transform of case apply in refchecksJason Zaugg2016-03-024-28/+72
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've identified a dead call to `transformCaseApply` that seems to date back to Scala 2.6 vintages, in which case factory methods were a fictional companion method, rather than a real apply method in a companion module. This commit adds an abort in that code path to aide code review (if our test suite still passes, we know that I've removed dead code, rather than silently changing behaviour.) The following commit will remove it altogether I then inlined a slightly clunky abstraction in the two remaining calls to `transformCaseApply`. It was getting in the way of a clean fix to SI-9546, the topic of the next commit.
| * | | Skip merging #5000 from 2.11.x into 2.12.xAdriaan Moors2016-03-140-0/+0
| |\| |
| | * | Merge pull request #5000 from felixmulder/patch-2Seth Tisue2016-03-011-1/+1
| | |\ \ | | | | | | | | | | Fix bold text in reflect API for 2.11.x
| | | * | Fix bold text in reflect API for 2.11.xFelix Mulder2016-02-271-1/+1
| | |/ / | | | | | | | | Same as #4999
| * | | Merge commit 2.11.x into 2.12.x.Adriaan Moors2016-03-143-48/+48
| |\| |
| | * | Merge pull request #4993 from SethTisue/sbt-0.13.11Seth Tisue2016-02-263-48/+48
| | |\ \ | | | | | | | | | | upgrade to sbt 0.13.11
| | | * | upgrade to sbt 0.13.11Seth Tisue2016-02-223-48/+48
| | | | | | | | | | | | | | | | | | | | yum! delicious dogfood!
* | | | | Merge pull request #5018 from ↵Seth Tisue2016-03-141-5/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | janekdb/topic/2.12.x-scaladoc-advertise-deprecated-read-methods-less-Predef Remove mention of deprecated I/O methods from Predef main comment
| * | | | | Remove mention of deprecated I/O methods from Predef main commentJanek Bogucki2016-03-141-5/+31
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The read* functions are deprecated so should not be highlighted. Copied Scaladoc from Console on the assumption that few people will tarry for long once they have seen the existence of the print* methods. Linkified print* methods. Added note to printf encouraging use of f interpolator.
* | | | | Merge pull request #5013 from janekdb/2.12.x-Scaladoc-ConversionsSeth Tisue2016-03-143-49/+49
|\ \ \ \ \ | | | | | | | | | | | | Format collection conversions Scaladoc as code blocks instead of bullets
| * | | | | Format collection conversions Scaladoc as code blocks instead of bulletsJanek Bogucki2016-03-093-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Makes the list of conversions easier to scan - Makes main comment formatting internally consistent
* | | | | | Merge pull request #5014 from janekdb/2.12.x-WeakHashSet-spellingSeth Tisue2016-03-141-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix var spelling in WeakHashSet
| * | | | | | Fix var spelling in WeakHashSetJanek Bogucki2016-03-091-6/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | WeakHashSet is internal so an exception was made against binary compatibility to allow the var to be made private.
* | | | | | Merge pull request #5039 from felixmulder/topic/scaladoc-clear-input-behaviorSeth Tisue2016-03-142-19/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Scaladoc: change behavior of clear-button on input fields
| * | | | | Change behavior of clear-button on input fieldsFelix Mulder2016-03-142-19/+13
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes the behavior to only remove the "x" if there is no input in the input field. The old behavior was to bind the blur event to be fired later - but this had the drawback of not working properly on fast hardware as the timeout would actually beat the click event.
* | | | | Merge pull request #4717 from Ichoran/issue/9347Adriaan Moors2016-03-146-3/+79
|\ \ \ \ \ | | | | | | | | | | | | SI-9347 Efficient head/tail, if possible, for immutable maps & sets
| * | | | | SI-9347 Efficient head/tail, if possible, for immutable maps & setsRex Kerr2016-02-176-3/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most immutable collections, including sets and maps, have a better-than-O(n) method for removing an element. In those cases, tail and possibly head were overridden so the head/tail pattern can be used with less of a performance penalty. Speed improvements on head/tail pattern are (for sets/maps of size 1024, unless otherwise specified): ``` BitSet 190x HashSet 250x Set 400x Set2 9x Set4 12x HashMap 430x ListMap 2500x // size 128 Map 430x ``` Note: `ListMap` is actually `init`/`last` because it's maintained in reverse order. Altered ListMap docs to explain that reverse traversal is the fast way to do it. All tested sets/maps that were already fast are still fast. Test code is reproduced below, except it does ListSet with head/tail which doesn't show the improvement: ```scala object BenchTailSetMap { val th = new ichi.bench.Thyme val standard = 1 to 1024 val sets = Map[String, Set[Int]]( "Set" -> (Set.empty[Int] ++ standard), "Set4"-> Set(4, 7, 2, 1), "Set2"-> Set(3, 4), "HashSet" -> (collection.immutable.HashSet.empty[Int] ++ standard), "BitSet" -> (collection.immutable.BitSet.empty ++ standard), "SortedSet" -> (collection.immutable.SortedSet.empty[Int] ++ standard), "ListSet" -> (collection.immutable.ListSet.empty[Int] ++ standard) ) val pairs = standard.map(i => i -> i.toString) // ListMap implementation is HORRIBLE, O(n^3) tail! Cut down size. val maps = Map[String, Map[Int, String]]( "Map" -> (Map.empty[Int, String] ++ pairs), "HashMap" -> (collection.immutable.HashMap.empty[Int, String] ++ pairs), "SortedMap" -> (collection.immutable.SortedMap.empty[Int, String] ++ pairs), "ListMap" -> (collection.immutable.ListMap.empty[Int, String] ++ pairs.take(128)) ) def hts(s: Set[Int]) = { var si = s var x = 0 while (si.nonEmpty) { x += si.head si = si.tail } x } def htm(m: Map[Int, String]) = { var mi = m var x = 0 while (mi.nonEmpty) { x += mi.head._2.length mi = mi.tail } x } def run() { sets.toList.sortBy(_._1).foreach{ case (name, s) => th.pbench(hts(s), s.size, name) } maps.toList.sortBy(_._1).foreach{ case (name, m) => th.pbench(htm(m), m.size, name) } } } ```
* | | | | | Merge pull request #5023 from dongjoon-hyun/fix_link_descriptionSeth Tisue2016-03-141-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix link descriptions
| * | | | | | Fix link descriptions.Dongjoon Hyun2016-03-131-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5038 from felixmulder/topic/scaladoc-remove-unused-classesVlad Ureche2016-03-1416-1418/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused classes from Scaladoc
| * | | | | | Remove unused classes from ScaladocFelix Mulder2016-03-1416-1418/+15
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several elements of the old Scaladoc are not in use anymore. To help with any reverting, the removal of these is done in a single commit (this one). The removal includes: - Old `Index`, the old top "index.html" - The letter index (with "_" and "deprecated") - The old `Template` which is superceded by `Entity`
* | | | | | Merge pull request #5015 from ↵Adriaan Moors2016-03-131-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | janekdb/topic/2.12.x-scaladoc-elide-below-off-by-one-Predef Scaladoc: Fix elidable threshold off-by-one comment and link elidable
| * | | | | | Scaladoc: Fix elidable threshold off-by-one comment and link elidableJanek Bogucki2016-03-091-8/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When -Xelide-below is 2000 (i.e. at least ASSERTION) the assert methods are not elided. - Fixed the above off-by-one error. - Made elidable a link
* | | | | | Merge pull request #5009 from janekdb/2.12.x-bump-sbt-compiler-interfaceAdriaan Moors2016-03-131-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update sbt version to most recent that includes the compiler interface
| * | | | | Update sbt version to most recent that includes the compiler interfaceJanek Bogucki2016-03-091-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compiler-interface-src.jar was available for 0.13.9 but not 0.13.10 or 0.13.11 at the time this commit was tested. This in preparation for removing Predef#error which was deprecated in 2.9.0.
* | | | | Merge pull request #5029 from mathhun/typo-fixSeth Tisue2016-03-091-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix typo
| * | | | | Fix typomathhun2016-03-091-2/+2
|/ / / / /
* | | | | Merge pull request #4970 from retronym/ticket/9658Jason Zaugg2016-03-092-2/+12
|\ \ \ \ \ | | | | | | | | | | | | SI-9658 Fix crosstalk between partial fun. and GADT match
| * | | | | SI-9658 Fix crosstalk between partial fun. and GADT matchJason Zaugg2016-03-042-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When typechecking the synthetic default case of a pattern matching anonymous partial function, we failed to create a new `Context`. This led to crosstalk with the management of the saved type bounds of an enclosing GADT pattern match. This commit avoids the direct call to `typeCase` and instead indirects through `typedCases`, which spawns a new nested typer context, and hence avoids the crosstalk when `restoreSavedTypeBounds` runs.
* | | | | | Merge pull request #5016 from felixmulder/topic/scaladoc-fallback-monospacedVlad Ureche2016-03-073-31/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add fallback typefaces for monospaced sections in scaladoc
| * | | | | | Add fallback typefaces for monospaced sections in scaladocFelix Mulder2016-03-073-31/+32
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit will also fix the `Filter All Members` input appearing if there are no members - please see root for an example. There's also a small CSS fix that addresses a vertical scrollbar on smaller viewports (footer was not responsively resized). review: @VladUreche lol
* | | | | | Merge pull request #5010 from janekdb/2.12.x-deprecate-expand-all-typesVlad Ureche2016-03-061-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-6886: Deprecate -expand-all-types
| * | | | | | SI-6886: Deprecate -expand-all-typesJanek Bogucki2016-03-041-1/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This Scaladoc flag was added to assist with debugging and was not intended to have general availability. If an element requires a separate Scaladoc page add @documentable.
* | | | | | Merge pull request #5007 from SethTisue/scala-dev-issue-89Seth Tisue2016-03-041-14/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | fix bootstrap regression (module docs weren't being published)
| * | | | | fix bootstrap regression (module docs weren't being published)Seth Tisue2016-03-031-14/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reverts the "skip docs on first module build" part of c4fc2fd42457a87fea9e7af94e0ba2f57e533854 since it was resulting in module docs never being published at all, which then would later cause release-website-archives to fail. see https://github.com/scala/scala-dev/issues/89
* | | | | Merge pull request #5004 from felixmulder/topic/scaladoc-fix-content-diagramsVlad Ureche2016-03-023-10/+14
|\ \ \ \ \ | | | | | | | | | | | | Fix diagrams for `Content Hierarchies` in scaladoc
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-19 10:20:44 +0000