summaryrefslogtreecommitdiff
path: root/src/library
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4813 from rcmurphy/topic/improved-softrefSeth Tisue2015-10-271-0/+13
|\ | | | | Add Extractor and apply Method for SoftReference
| * Add Extractor and apply Method for SoftReferenceRebecca Claire Murphy2015-10-221-0/+13
| | | | | | | | | | | | | | | | scala.ref.WeakReference has two features which are lacking in scala.ref.SoftReference, an extractor and a .apply method that greatly enhance the usability of that class. This commit simply replicates that functionality for SoftReference.
* | Merge pull request #4794 from densh/topic/predef-autoboxingSeth Tisue2015-10-271-17/+17
|\ \ | |/ |/| Fixes an inconsistency between BoxesRunTime and Predef's autoboxing
| * Fixes an inconsistency between BoxesRunTime and Predef's autoboxingDenys Shabalin2015-10-081-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | Previously autoboxing implicits in Predef were inconsistent with BoxesRunTime box/unbox due to different treatment of unboxing of nulls. Implicits didn't check for null and would crash with NPE unlike the BoxesRunTime which correctly returned zero value of given type. The fix is trivial: lets just use asInstanceOfs to implement implicits in Predef. This would ensure that both have the same behaviour and that the two would not diverge again in the future.
* | Merge pull request #4802 from SethTisue/merge-2.11-to-2.12-oct-16Lukas Rytz2015-10-2110-69/+101
|\ \ | | | | | | merge 2.11 to 2.12 Oct 16
| * \ merge 2.11.x onto 2.12.x, Oct 16 2015Seth Tisue2015-10-1610-69/+101
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there were merge conflicts in the Eclipse config that I resolved with --ours. I invite @performantdata to submit a followup PR bringing the Eclipse stuff into a good state on 2.12.x. there was a test failure in test/junit/scala/collection/mutable/OpenHashMapTest.scala due to the 2.12 compiler emitting the field backing a private var differently (with an unmangled name). Lukas says the difference is expected, so I just updated the code in the test. there were no other merge conflicts. % git log --decorate --oneline -1 origin/2.11.x | cat ae5f0de (origin/HEAD, origin/2.11.x) Merge pull request #4791 from performantdata/issue/9508 % git log --decorate --oneline -1 origin/2.12.x | cat c99e53e (HEAD -> 2.12.x, origin/2.12.x) Merge pull request #4797 from lrytz/M3-versions % export MB=$(git merge-base 2.12.x origin/2.11.x) % echo $MB 42cafa21f3c4a08c6dd34608278f810b6ec2886f % git log --graph --oneline --decorate $MB...origin/2.11.x | cat * ae5f0de (origin/HEAD, origin/2.11.x) Merge pull request #4791 from performantdata/issue/9508 |\ | * 08dca37 (origin/pull/4791) SI-9508 fix classpaths in Eclipse configuration * | fe76232 Merge pull request #4798 from performantdata/issue/9513 |\ \ | * | 9c97a7f (origin/pull/4798) Suppress unneeded import. | * | 30d704d Document some OpenHashMap internal methods. | * | 1fb32fc SI-9513 decrement "deleted" count in OpenHashMap.put() when slot reused | |/ * | 14f875c Merge pull request #4788 from dk14/patch-1 |\ \ | * | 42acd55 (origin/pull/4788) explicitly specify insertion-order feature in docs | / * | 68ce049 Merge pull request #4771 from som-snytt/issue/9492-here |\ \ | * | f290962 (origin/pull/4771) SI-9492 Line trimming paste | * | bc3589d SI-9492 REPL paste here doc | / * | 9834fc8 Merge pull request #4610 from todesking/spec-implicits-remove-obsolete |\ \ | * | 46009b1 (origin/pull/4610) Add view/context-bound parameter ordering rule | * | 6eba305 Spec: Implicit parameters with context/view bound is allowed since 2.10 | / * | d792e35 Merge pull request #4789 from janekdb/2.11.x-param-names-predicates-operations |\ \ | |/ |/| | * b19a07e (origin/pull/4789) Rename forall, exists and find predicate and operator params. |/ * 648c7a1 Merge pull request #4790 from SethTisue/issue/9501 |\ | * 40d12f1 (origin/pull/4790) SI-9501 link README to Scala Hacker Guide * e0b5891 Merge pull request #4786 from performantdata/issue/9506 * 39acad8 (origin/pull/4786) SI-9506 suppress Scala IDE-generated files in the Eclipse project dirs * 74dc364 SI-9506 suppress Scala IDE-generated files in the Eclipse project dirs % git merge ae5f0de Auto-merging src/repl/scala/tools/nsc/interpreter/ILoop.scala Auto-merging src/library/scala/util/Either.scala Auto-merging src/library/scala/runtime/Tuple3Zipped.scala Auto-merging src/library/scala/runtime/Tuple2Zipped.scala Auto-merging src/library/scala/collection/parallel/ParIterableLike.scala Auto-merging src/library/scala/collection/immutable/ListMap.scala Auto-merging src/library/scala/collection/TraversableLike.scala Auto-merging src/eclipse/test-junit/.classpath CONFLICT (content): Merge conflict in src/eclipse/test-junit/.classpath Auto-merging src/eclipse/scaladoc/.classpath CONFLICT (content): Merge conflict in src/eclipse/scaladoc/.classpath Auto-merging src/eclipse/scala-compiler/.classpath Auto-merging src/eclipse/repl/.classpath CONFLICT (content): Merge conflict in src/eclipse/repl/.classpath Auto-merging src/eclipse/partest/.classpath CONFLICT (content): Merge conflict in src/eclipse/partest/.classpath Auto-merging src/eclipse/interactive/.classpath Auto-merging README.md Automatic merge failed; fix conflicts and then commit the result. % git checkout --ours src/eclipse/partest/.classpath % git checkout --ours src/eclipse/repl/.classpath % git checkout --ours src/eclipse/scaladoc/.classpath % git checkout --ours src/eclipse/test-junit/.classpath % git add -u % emacs test/junit/scala/collection/mutable/OpenHashMapTest.scala % git diff test/junit/scala/collection/mutable/OpenHashMapTest.scala | cat ... - val field = m.getClass.getDeclaredField("scala$collection$mutable$OpenHashMap$$deleted") + val field = m.getClass.getDeclaredField("deleted") ... % git add -u
| | * Merge pull request #4798 from performantdata/issue/9513Seth Tisue2015-10-151-1/+18
| | |\ | | | | | | | | SI-9513 decrement "deleted" count in OpenHashMap.put() when slot reused
| | | * Document some OpenHashMap internal methods.Performant Data LLC2015-10-101-0/+13
| | | |
| | | * SI-9513 decrement "deleted" count in OpenHashMap.put() when slot reusedPerformant Data LLC2015-10-101-1/+5
| | | |
| | * | Merge pull request #4788 from dk14/patch-1Seth Tisue2015-10-141-1/+1
| | |\ \ | | | | | | | | | | explicitly specify insertion-order feature in docs
| | | * | explicitly specify insertion-order feature in docsdk142015-10-061-1/+1
| | | |/
| | * / Rename forall, exists and find predicate and operator params.Janek Bogucki2015-10-099-71/+86
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align parameters names to use p for predicates and op for combining operations. Based on #4760. Extended to include, - Tuple2Zipped - Tuple3Zipped - Either The original author was vsalvis.
* | / Allow @inline/noinline at callsites (in addition to def-site)Lukas Rytz2015-10-202-4/+48
|/ / | | | | | | | | | | | | Allow annotating individual callsites @inline / @noinline using an annotation ascription c.foo(): @inline
* | Minor fixes to Scaladoc of implicitAmbiguousLukas Rytz2015-10-061-7/+7
| |
* | Merge commit 'bb3ded3' into merge-2.11-to-2.12-oct-5Lukas Rytz2015-10-052-3/+3
|\|
| * Use InternalCallbackExecutor in Future.sequencePaul Draper2015-10-021-1/+1
| | | | | | | | | | Previously _.result() was invoked in the "real" ExecutionContext, but this is an unnecessary use of the context.
| * Fix typo in Process.scalaRyan Zhang2015-09-291-2/+2
| |
* | Make AnyRefMap serializableJason Zaugg2015-09-251-0/+2
| |
* | Merge commit '03aaf05' into merge-2.11-to-2.12-sep-22Lukas Rytz2015-09-224-46/+77
|\|
| * Merge pull request #4716 from Ichoran/issue/9388Lukas Rytz2015-09-212-42/+73
| |\ | | | | | | SI-9388 Fix Range behavior around Int.MaxValue
| | * SI-9388 Fix Range behavior around Int.MaxValueRex Kerr2015-09-192-42/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | terminalElement (the element _after_ the last one!) was used to terminate foreach loops and sums of non-standard instances of Numeric. Unfortunately, this could result in the end wrapping around and hitting the beginning again, making the first element bad. This patch fixes the behavior by altering the loop to end after the last element is encountered. The particular flavor was chosen out of a few possibilities because it gave the best microbenchmarks on both large and small ranges. Test written. While testing, a bug was also uncovered in NumericRange, and was also fixed. In brief, the logic around sum is rather complex since division is not unique when you have overflow. Floating point has its own complexities, too. Also updated incorrect test t4658 that insisted on incorrect answers (?!) and added logic to make sure it at least stays self-consistent, and fixed the range.scala test which used the same wrong (overflow-prone) formula that the Range collection did.
| * | Merge pull request #4758 from lrytz/pagedSeqNpeSeth Tisue2015-09-211-2/+2
| |\ \ | | | | | | | | Fix NPE in PagedSeq.slice at end of seq
| | * | Fix NPE in PagedSeq.slice at end of seqTomas Janousek2015-09-211-2/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/scala/scala-parser-combinators/issues/70 Basically the same thing as SI-6615, including the fact everything works okay if the PagedSeq is printed before calling slice. It might seem strange that this allows taking slices that start beyond the end, but - this was possible anyway if one forced the entire sequence, and - it is reasonable to be able to take a slice at the very end (not beyond it) and get an empty sequence, which is exactly what StreamReader in scala-parser-combinators does and gets an NPE.
| * / bump copyright year in `scala -version`Seth Tisue2015-09-181-2/+2
| |/ | | | | | | | | | | | | a little piece of #4644 I missed. fixes this: % scala -version Scala code runner version 2.11.7 -- Copyright 2002-2013, LAMP/EPFL
* | Merge commit 'a170c99' into 2.12.xLukas Rytz2015-09-2229-79/+175
|\|
| * Merge pull request #4738 from janekdb/2.11.x-urls-driftedSeth Tisue2015-09-153-6/+5
| |\ | | | | | | Improve drifted URLs
| | * Improve drifted URLsJanek Bogucki2015-09-093-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Any.scala: Link to the guide instead of the SIP. - AnyVal.scala: Remove SIP link and align guide link to Any.scala. - Commands.scala: Use a less out of date team link. - Logic.scala: Link was broken. Substitute found. - Process.scala: Links were 403 & 404. Fixed as this is a code sample. - TypeMaps.scala: Move old EPFL Trac to JIRA. - RedBlackTree.scala: Replaced broken link with substitutes based on site maintainer input [1]. [1] When asked where Data-Set-RBTree.html had gone Don@UNSW advised "I think it's on the Haskell wiki now. It was Chris Okazaki's version". The closest I could find to what this document probably was is this paper by Hinze edited by Okasaki, http://www.cs.ox.ac.uk/ralf.hinze/publications/WAAAPL99b.ps.gz The paper cites the Okasaki document so I included a link to that as well. The Haskell Wiki does have a link to a RB document but that's broken too, https://wiki.haskell.org/Research_papers/Data_structures > Constructing red-black trees
| * | Merge pull request #4728 from janekdb/2.11.x-urls-docs-codehaus-citeseerSeth Tisue2015-09-154-3/+6
| |\ \ | | | | | | | | Update links to docs, codehaus and citeseer
| | * | Update links to docs, codehaus and citeseerJanek Bogucki2015-09-044-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs.scala-lang.org - Align some links to new layout for docs.scala-lang.org - Include link to concrete parallel collection performance characteristics codehaus - Subsitute a link to a JIRA email for the 404 JRUBY-3576 JIRA link in Codec.scala. jira.codehaus.org is not redirecting this. citeseer - Replace the citeseer link with a direct link to a PDF which is not behind a login challenge.
| * | | Merge pull request #4742 from janekdb/2.11.x-scaladoc-in-context-ListSeth Tisue2015-09-151-1/+1
| |\ \ \ | | | | | | | | | | Restore missing element type to List class documentation
| | * | | Restore missing element type to List class documentationJanek Bogucki2015-09-111-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | See line 18, git show cb1c0c src/library/scala/collection/immutable/List.scala|head -20|cat -n This shows the type reference prior to removal.
| * | | Merge pull request #4727 from SethTisue/unset-stray-execute-bitsSeth Tisue2015-09-1419-0/+0
| |\ \ \ | | |/ / | |/| | unset inappropriate execute bits
| | * | unset inappropriate execute bitsSeth Tisue2015-09-0219-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I imagine these date back to old Subversion days and are probably the result of inadvertent commits from Windows users with vcs client configs. having the bit set isn't really harmful most of the time, but it's just not right, and it makes the files stand out in directory listings for no reason
| * | | Merge pull request #4714 from Ichoran/issue/9407Seth Tisue2015-09-081-10/+1
| |\ \ \ | | | | | | | | | | SI-9407 Vector implementation bit-shift bugfix
| | * | | SI-9407 Vector implementation bit-shift bugfixRex Kerr2015-08-291-10/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | Fixed logically incorrect or unnecessary code in Vector as reported by Dirk Toewe. No tests. Because of the size of the vectors, tests would be impractically slow. Also, the logic is quite clear: when you are recursing through a tree, using the wrong bit shift means you hit the wrong part of the tree, and when you create and then always overwrite a mutable var, you should just not do it to begin with.
| * | | Merge pull request #4333 from Ichoran/opt-Iterator-2.11.xSeth Tisue2015-09-081-59/+162
| |\ \ \ | | | | | | | | | | Performance optimization - Iterator
| | * | | Performance optimization - Iterator span, collect, dropWhileRex Kerr2015-08-071-35/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite of span to avoid double-indirection of `.buffered` and to avoid use of `mutable.Queue` unless it is absolutely necessary. Rewrite of `span` and `dropWhile` to also avoid `.buffered` (less DRY but single vs. double indirection and object allocation). Performance improvements: ``` method reason =========== =============================================================== collect 2.3x faster on small collections, 1.5x on large span 1.6-1.7x faster on small collections 0.85x-1.8x slower/faster on large collections depending on how much must be cached (0.85x all, 1.8x none) dropWhile 1.2x faster on small collections, half the garbage ```
| | * | | Performance optimization - Iterator flatMap, find, indexWhere, indexOfRex Kerr2015-08-071-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tightened up bytecode, logic, and/or performance by using local return instead of a mutable variable in several methods. Performance/bytecode size improvements (smaller bytecode = better inlining) ``` method reason =========== =============================================================== flatMap hasNext bytecode 34 bytes down from 62 find bytecode 41 bytes instead of 53 indexWhere 1.5x faster on small collections (some contexts) indexOf bytecode 89 bytes instead of 110 ```
| * | | | Merge pull request #4713 from SethTisue/batch-of-typosJason Zaugg2015-09-081-2/+2
| |\ \ \ \ | | | | | | | | | | | | fix typos/spelling
| | * | | | fix assorted typosSeth Tisue2015-08-281-2/+2
| | | |/ / | | |/| |
| * | | | Merge pull request #4722 from janekdb/2.11.x-scaladoc-in-context-AnyValDick Wall2015-09-061-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | | Link to completed value classes SIP page instead of pending version
| | * | | Link to completed value classes SIP page instead of pending versionJanek Bogucki2015-09-011-1/+1
| | |/ /
| * | | Merge pull request #4726 from janekdb/2.11.x-now-Oracle-urlsSeth Tisue2015-09-033-3/+3
| |\ \ \ | | | | | | | | | | Update Java and Sun URLs to replacement Java and Oracle URLs
| | * | | Update Java and Sun URLs to replacement Java and Oracle URLsJanek Bogucki2015-09-023-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For each URL - Where it redirected the target of the redirection was used - Where is no longer existed a replacement was selected
| * | | | Merge pull request #4715 from Ichoran/issue/9424Seth Tisue2015-09-021-2/+13
| |\ \ \ \ | | |/ / / | |/| | | SI-9424 Clarify behavior of PriorityQueue toString
| | * | | SI-9424 Clarify behavior of PriorityQueue toStringRex Kerr2015-08-291-2/+13
| | |/ / | | | | | | | | | | | | | | | | | | | | Clarified that PriorityQueue will not print in order and gave an example of a workaround if one needs it. Documentation change only; no tests.
| * | | Merge pull request #4701 from janekdb/2.11.x-scaladoc-in-context-OptionSeth Tisue2015-09-021-1/+1
| |\ \ \ | | |/ / | |/| | Improve comment in Option.collect example
| | * | Improve implementation comments in Option.collect exampleJanek Bogucki2015-08-311-1/+1
| | | |
| * | | Merge pull request #4707 from fthomas/topic/pins-linkLukas Rytz2015-08-281-2/+3
| |\ \ \ | | | | | | | | | | Add link to online version of Programming in Scala
| | * | | Add link to online version of Programming in ScalaFrank S. Thomas2015-08-241-2/+3
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-10 22:14:51 +0000