summaryrefslogtreecommitdiff
path: root/src/library
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #830 from heathermiller/topic/tryeither-fixesAdriaan Moors2012-07-067-93/+148
|\ | | | | SI-5981, SI-5979, SI-5973, SI-5890 Closed. Maintenance to Try.
| * Updates scala.util.control.NonFatal documentation, as suggested in code reviewHeather Miller2012-07-061-6/+9
| |
| * SI-5981, SI-5979, SI-5973 Closed. Maintenance to Try.Heather Miller2012-07-057-87/+139
| |
* | SI-6033 Closed. Provides implicit conversion from java.math.BigInteger to BigIntDominik Gruntz2012-07-051-1/+10
|/
* tags for AnyVal and AnyRefEugene Burmako2012-07-042-2/+10
|
* Merge pull request #810 from scalamacros/pullrequest/manifests-and-ticket6005Adriaan Moors2012-07-0311-96/+122
|\ | | | | two pullrequests from this morning, combined to merge changes to starrs
| * miscellaneous cleanupEugene Burmako2012-07-021-2/+2
| |
| * removes ClassTag.String and TypeTag.StringEugene Burmako2012-07-024-9/+0
| | | | | | | | | | | | | | | | | | | | TypeTag.String is removed because it's unclear whether it should point to scala.Predef.String or to java.lang.String. ClassTag.String is removed to be consistent with TypeTag.String. This requires re-bootstrapping, because Definitions.scala in locker expects classTag[String] being automatically generated, whereas starr disagrees with locker on how to generate that class tag.
| * Improves backward compatibility of manifestsEugene Burmako2012-07-028-85/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) type ClassManifest[T] = ClassTag[T] (solves a problem with toArray[T: ClassManifest] defined on most of the collections; if these types weren't aliases, then we won't be able to change the signature of that method to toArray[T: ClassTag], because that would break source compatibility for those who override toArray in their custom collections) 2) Compiler-generated manifests no longer trigger deprecation warnings (this is implemented by using ClassManifestFactory instead of ClassManifest and ManifestFactory instead of Manifest) 3) Deprecation messages got improved to reflect the changes that were introduced in 2.10.0-M4.
* | better module classes support in the reflection APIEugene Burmako2012-07-023-5/+23
|/
* Merge pull request #792 from jsuereth/fixup/from-reprJosh Suereth2012-06-294-33/+82
|\ | | | | Split @milessabin HasRepr into IsTraversableOnce and IsTraversableLike t...
| * Split @milessabin HasRepr into IsTraversableOnce and IsTraversableLike type ↵Josh Suereth2012-06-274-33/+82
| | | | | | | | class-ish things.
* | Merge pull request #793 from jsuereth/fix/convert-toJosh Suereth2012-06-294-12/+12
|\ \ | | | | | | Renaming convertTo to to on GenTraversableOnce.
| * | Renaming convertTo to to on GenTraversableOnce.Josh Suereth2012-06-284-12/+12
| | |
* | | Merge branch 'master' into issue/5846,4597,4027,4112Aleksandar Prokopec2012-06-2830-389/+442
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/library/scala/collection/MapLike.scala src/library/scala/collection/SortedMapLike.scala
| * \ \ Merge pull request #790 from axel22/issue/3326Josh Suereth2012-06-281-0/+8
| |\ \ \ | | |/ / | |/| | Fix SI-3326.
| | * | Fix SI-3326.Aleksandar Prokopec2012-06-271-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The heart of the problem - we want to retain the ordering when using `++` on sorted maps. There are 2 `++` overloads - a generic one in traversables and a map-specific one in `MapLike` - which knows about the ordering. The problem here is that the expected return type for the expression in which `++` appears drives the decision of the overload that needs to be taken. The `collection.SortedMap` does not have `++` overridden to return `SortedMap`, but `immutable.Map` instead. This is why `collection.SortedMap` used to resort to the generic `TraversableLike.++` which knows nothing about the ordering. To avoid `collection.SortedMap`s resort to the more generic `TraverableLike.++`, we override the `MapLike.++` overload in `collection.SortedMap` to return the proper type `SortedMap`.
| * | | Merge pull request #791 from axel22/issue/5336Josh Suereth2012-06-272-1/+3
| |\ \ \ | | | | | | | | | | Fix SI-5336.
| | * | | Fix SI-5336.Aleksandar Prokopec2012-06-272-1/+3
| | |/ /
| * | | Merge pull request #786 from axel22/issue/5986-cherryJosh Suereth2012-06-273-20/+21
| |\ \ \ | | | | | | | | | | Fix SI-5986.
| | * | | Fix SI-5986.Aleksandar Prokopec2012-06-273-20/+21
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here we had an issue that RedBlack does not work the same way for sets - which are not supposed to replace an element if it is the same (wrt equals) and maps - which should replace the corresponding values. Adding an overwrite parameter which decides whether to overwrite added keys if they are the same in the ordering. Fix tests.
| * | | Merge pull request #785 from axel22/feature/to-parJosh Suereth2012-06-271-6/+6
| |\ \ \ | | |_|/ | |/| | Parallelize convertTo in parallel collection.
| | * | Parallelize convertTo in parallel collection.Aleksandar Prokopec2012-06-271-6/+6
| | | |
| * | | Merge pull request #787 from axel22/issue/5971Josh Suereth2012-06-273-3/+3
| |\ \ \ | | | | | | | | | | Fix SI-5971.
| | * | | Fix SI-5971.Aleksandar Prokopec2012-06-273-3/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using `AbstractTransformed` abstract inner class in views in order to force generating bridges, one must take care to push the corresponding collection trait (such as `Iterable` or `Seq`) as far as possible to the left in the linearization order -- otherwise, overridden methods from these traits can override the already overridden methods in view. This was the case with `takeWhile`.
| * | | Merge pull request #754 from scalamacros/topic/removereflectcompatAdriaan Moors2012-06-273-35/+2
| |\ \ \ | | | | | | | | | | removes pre-M4 compatibility stubs for the IDE
| | * | | removes pre-M4 compatibility stubs for the IDEEugene Burmako2012-06-213-35/+2
| | | | |
| * | | | SI-5914 handle null in classtag extractorAdriaan Moors2012-06-261-1/+1
| | |/ / | |/| |
| * | | Merge pull request #766 from soc/patch-8Adriaan Moors2012-06-241-157/+161
| |\ \ \ | | | | | | | | | | remove semi-colons and extraneous whitespace
| | * | | LongMap: Made life a bit less scary for those doing source archaeology.soc2012-06-241-157/+161
| | | | |
| * | | | Merge pull request #764 from soc/patch-5Adriaan Moors2012-06-241-142/+147
| |\ \ \ \ | | | | | | | | | | | | remove semi-colons and extraneous whitespace
| | * | | | IntMap: Made life a bit less scary for those doing source archaeology.soc2012-06-241-142/+147
| | |/ / /
| * / / / Adds missing closing curly brace to ScalaDoc code example.soc2012-06-241-2/+3
| |/ / /
| * | | Merge pull request #756 from axel22/issue/4809Josh Suereth2012-06-221-4/+4
| |\ \ \ | | |/ / | |/| | Fix SI-4809.
| | * | Fix SI-4809.Aleksandar Prokopec2012-06-211-4/+4
| | |/
| * | Merge pull request #729 from scalamacros/topic/showrawAdriaan Moors2012-06-192-3/+3
| |\ \ | | | | | | | | improve showRaw
| | * | improves showRawEugene Burmako2012-06-192-3/+3
| | | | | | | | | | | | | | | | addresses concerns raised in http://groups.google.com/group/scala-user/browse_thread/thread/de5a5be2e083cf8e
| * | | Merge pull request #739 from jsuereth/feature/collection-conversionsJosh Suereth2012-06-187-4/+52
| |\ \ \ | | | | | | | | | | Adding copyInto and toVector methods to collections.
| | * | | Fixing embarassing typo.Josh Suereth2012-06-181-1/+1
| | | | |
| | * | | Migrate build to @odersky's suggestion of convertTo.Josh Suereth2012-06-185-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move method into TraversableOnce from Iterator and Traversable to make the build pass. * Udpate IDE tests with new collection methods. * Rewire default toXYZ methods to use convertTo.
| | * | | Rename copyTo to build based on consensus of 3Josh Suereth2012-06-184-7/+7
| | | | |
| | * | | Fixes from review.Josh Suereth2012-06-184-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed typo * Renamed copyInto to copyTo * Added tparam doc.
| | * | | Adding copyInto and toVector methods to collections.Josh Suereth2012-06-186-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | * Added generic copyInto method for collections. For any collection with a CanBuildFrom, can convert a generic collection into it using the builder. * Added specifici toVector method for collections. This is more efficient than copyInto if the collection is a Vector.
| * | | | Merge pull request #741 from axel22/issue/4954Josh Suereth2012-06-182-13/+36
| |\ \ \ \ | | | | | | | | | | | | Fix SI-4954.
| | * | | | Fix SI-4954.Aleksandar Prokopec2012-06-182-13/+36
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Override inner classes in `LinkedHashMap` that correspond to `filterKeys`, `mapValues` and `keys` to retain a proper ordering of elements when they are transformed.
| * | | | Merge pull request #742 from axel22/feature/pc-ctrieJosh Suereth2012-06-181-1/+5
| |\ \ \ \ | | | | | | | | | | | | Use `ThreadLocalRandom` in `TrieMap.size`.
| | * | | | Use `ThreadLocalRandom` in `TrieMap.size`.Aleksandar Prokopec2012-06-181-1/+5
| | |/ / /
| * | | | Merge pull request #725 from paulp/issue/arrayopsJosh Suereth2012-06-181-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | Remove unused type parameter.
| | * | | Remove unused type parameter.Paul Phillips2012-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | There should probably be a warning about non-overriding methods which have unreferenced type parameters.
| * | | | Merge pull request #736 from damienobrist/feature/diagrams-dev-revertJosh Suereth2012-06-181-13/+7
| |\ \ \ \ | | |_|/ / | |/| | | Reverting the diagrams