summaryrefslogtreecommitdiff
path: root/src/library
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2544 from ↵Adriaan Moors2013-05-174-31/+31
|\ | | | | | | | | viktorklang/wip-normalize-parameter-names-in-scala-concurrent-2.11-√ Deprecate parameter names in scala.concurrent
| * Deprecate parameter names in scala.concurrentViktor Klang2013-05-164-31/+31
| | | | | | | | | | | | | | for the purpose of being consistent. Also switches to Future.successful iso Promise.successful(..).future for brevity in implementation code.
* | Merge pull request #2539 from soc/SI-7484Adriaan Moors2013-05-175-48/+31
|\ \ | | | | | | SI-7484 Add @SupressWarning("rawtypes") to MainNode.java
| * | SI-7484 Indentation and whitespace fixesSimon Ochsenreither2013-05-175-51/+30
| | |
| * | SI-7484 Add @SupressWarning(rawtypes/unchecked)Simon Ochsenreither2013-05-173-0/+4
| | |
* | | Merge pull request #2538 from som-snytt/issue/6488-process-io-destroyAdriaan Moors2013-05-172-12/+20
|\ \ \ | | | | | | | | SI-6488 Interrupt i/o threads on process destroy
| * | | SI-6488 Interrupt i/o threads on process destroySom Snytt2013-05-152-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous fix uses Thread.stop to stop the threads which drain outputs, but should do something orderly. This commit interrupts the threads, which must check isInterrupted before attempting further i/o. The reading thread will suppress either the interruption or the IOException cited in the ticket. Similarly, i/o handlers must preserve and communicate interrupted status. The modest goal of this fix is to ameliorate any stack traces when the process is destroyed. The test runs itself as a sample process with output.
* | | | Merge pull request #2554 from paulp/merge/v2.10.1-326-g4f8c306-to-masterAdriaan Moors2013-05-172-2/+2
|\ \ \ \ | | | | | | | | | | Merge v2.10.1-326-g4f8c306 into master
| * \ \ \ Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-masterJason Zaugg2013-05-17660-6786/+3883
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ================================================================ Merge commit 'v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master Conflicts: src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala src/reflect/scala/reflect/runtime/JavaMirrors.scala ================================================================ Merge -s ours 4e64a27 ([nomaster commit range]) ================================================================ Merge commit '0ae7e55' into merge/v2.10.1-326-g4f8c306-to-master Conflicts: src/compiler/scala/tools/nsc/typechecker/Macros.scala
| * | | | Merge pull request #2502 from ↵Adriaan Moors2013-05-141-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | viktorklang/wip-SI7383-EC-prepare-in-Future-apply-2.10-√ SI-7383 - call ExecutionContext.prepare in Future.apply
| | * | | | SI-7383 - Call ExecutionContext.prepare in Future.apply to allow for ↵Viktor Klang2013-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | capturing local context like ThreadLocals and then re-establishing them prior to execution, as per intention of EC.prepare
| * | | | | Merge pull request #2496 from igormoreno/2.10.xPaul Phillips2013-05-111-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | Scaladoc: fixing small typo in PartialFunction.scala
| | * | | | Scaladoc: fixing small typo in PartialFunction.scalaIgor Moreno2013-05-051-1/+1
| | | | | | | | | | | | | | | | | | Fixing a one-letter typo in the documentation of PartialFunction.scala (from "an plain" to "a plain").
| * | | | | Merge pull request #2303 from starblood/gyuhang/libdocAdriaan Moors2013-04-021-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | Correct sorting example for Ordering in scaladoc
| | * | | | Correct sorting example for Ordering in scaladocGyuhang Shim2013-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Below code snippet, Sorting.quickSort(pairs)(Ordering.by[(String, Int, Int), Int](_._2) should be Sorting.quickSort(pairs)(Ordering.by[(String, Int, Int), Int](_._2))
* | | | | | Unprivatize methods in SyncVar.Jason Zaugg2013-05-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are still used in SBT 0.13.0-M2. This is a partial revert of ac990c1bc.
* | | | | | Revert "SI-7469 Remove @deprecated MurmurHash elements"Jason Zaugg2013-05-172-0/+207
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7e9c21ffd38711c23f89b5650cc5a32cafe4cd20. This is still used by SBT; we'll give it a touch longer to switch to Murmur3.
* | | | | Merge pull request #2519 from som-snytt/issue/regex-revertAdriaan Moors2013-05-161-0/+14
|\ \ \ \ \ | | | | | | | | | | | | SI-6406 Restore deprecated API
| * | | | | SI-6406 Restore deprecated APISom Snytt2013-05-121-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original patch for SI-6406 was intended for 2.10 but during those volatile weeks of early autumn, it missed the boat. A deprecated method was incorrectly tagged at 2.10 and later removed; this restores the method and its test, and resets the deprecation clock to 2.11. The deprecation tool should confirm that changes occur on the git timeline as claimed.
* | | | | | SI-7469 Remove @deprecated scala.util.loggingSimon Ochsenreither2013-05-166-86/+18
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #2527 from soc/SI-7476Jason Zaugg2013-05-161-4/+50
|\ \ \ \ \ | |_|_|_|/ |/| | | | SI-7476 Add documentation to GenericTraversableTemplate
| * | | | SI-7476 Add documentation to GenericTraversableTemplateSimon Ochsenreither2013-05-131-4/+50
| |/ / /
* | | | Merge pull request #2520 from soc/SI-7469-concurrentJason Zaugg2013-05-155-6/+6
|\ \ \ \ | | | | | | | | | | SI-7469 Make @deprecated elems in scala.concurrent private[scala]
| * | | | SI-7469 Make @deprecated elems in scala.concurrent private[scala]Simon Ochsenreither2013-05-125-6/+6
| |/ / / | | | | | | | | | | | | They can't be removed yet because scala.actors depends on it.
* | | | Merge pull request #2521 from soc/SI-7469-combinatorJason Zaugg2013-05-153-79/+0
|\ \ \ \ | | | | | | | | | | SI-7469 Remove deprecated elements in s.u.parsing.combinator
| * | | | SI-7469 Remove deprecated elements in s.u.parsing.combinatorSimon Ochsenreither2013-05-123-79/+0
| |/ / /
* | | | Merge pull request #2523 from soc/SI-7469-hashingJason Zaugg2013-05-152-206/+0
|\ \ \ \ | | | | | | | | | | SI-7469 Remove @deprecated MurmurHash elements
| * | | | SI-7469 Remove @deprecated MurmurHash elementsSimon Ochsenreither2013-05-122-206/+0
| |/ / /
* | | | Merge pull request #2498 from rladstaetter/patch-1Jason Zaugg2013-05-151-1/+1
|\ \ \ \ | | | | | | | | | | fix typo in comment
| * | | | fix typo in commentRobert Ladstätter2013-05-061-1/+1
| | | | |
* | | | | SI-7469 Remove @deprecated scala.util.parsing.astSimon Ochsenreither2013-05-132-381/+0
| |/ / / |/| | |
* | | | Merge pull request #2470 from ihji/masterPaul Phillips2013-05-111-2/+2
|\ \ \ \ | | | | | | | | | | SI-7432 Range.min should throw NoSuchElementException on empty range
| * | | | SI-7432 Range.min should throw NoSuchElementException on empty rangeHeejong Lee2013-04-301-2/+2
| |/ / / | | | | | | | | | | | | | | | | For consistency, range.max and range.min should throw NoSuchElementException on an empty range.
* | | | Merge pull request #2462 from magarciaEPFL/backendish9Paul Phillips2013-05-1018-0/+54
|\ \ \ \ | | | | | | | | | | SI-6863 root cause fixed using factory of scala.runtime.*Ref
| * | | | SI-6863 root cause fixed using factory of scala.runtime.*RefMiguel Garcia2013-04-2718-0/+54
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit does away with an error-prone division of labor between UnCurry and LambdaLift, a division of labor by which UnCurry had to anticipate under which circumstances LambdaLift creates a scala.runtime.*Ref whose initial value is given by a an expression including a Try in non-statement position. That sounds complicated, and it is. The solution so far (fixing SI-6863) is replaced by a simpler approach, at the cost of forward binary comptability with pre-2.11 releases, this time fixing the root cause of SI-6863. From now on, a s.r.*Ref is instantiated via invocation of a static factory method in the s.r.*Ref class in question. Unlike the code that was emitted so far (which involved NEW refclass, DUP, expr, INVOKESPECIAL refclass.<init>) the "expr" doesn't appear on the operand stack on top of the *Ref value being initialized. In other words, the *Ref initialization is in statement position provided "expr" is.
* / / / Absolutized paths involving the scala package.Paul Phillips2013-05-03458-744/+982
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Confusing, now-it-happens now-it-doesn't mysteries lurk in the darkness. When scala packages are declared like this: package scala.collection.mutable Then paths relative to scala can easily be broken via the unlucky presence of an empty (or nonempty) directory. Example: // a.scala package scala.foo class Bar { new util.Random } % scalac ./a.scala % mkdir util % scalac ./a.scala ./a.scala:4: error: type Random is not a member of package util new util.Random ^ one error found There are two ways to play defense against this: - don't use relative paths; okay sometimes, less so others - don't "opt out" of the scala package This commit mostly pursues the latter, with occasional doses of the former. I created a scratch directory containing these empty directories: actors annotation ant api asm beans cmd collection compat concurrent control convert docutil dtd duration event factory forkjoin generic hashing immutable impl include internal io logging macros man1 matching math meta model mutable nsc parallel parsing partest persistent process pull ref reflect reify remote runtime scalap scheduler script swing sys text threadpool tools transform unchecked util xml I stopped when I could compile the main src directories even with all those empties on my classpath.
* | | SI-7403 Stream extends SerializableSimon Ochsenreither2013-04-251-3/+5
| | | | | | | | | | | | | | | Additionally, add @deprecatedInheritance to warn creators of custom subclasses that the class will be sealed in the future.
* | | Merge branch 'master' into pr/warning-cleanupPaul Phillips2013-04-241-1/+2
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/typechecker/Contexts.scala
| * | | SI-7402 List extends SerializableSimon Ochsenreither2013-04-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we are all aware of the issues around Serialization, I think in this case it is perfectly sound and safe to make List serializable: - List is not an interface, it is the base type of an ADT. Common behavior of its members should be reflected in the base type. - List is sealed, there is no chance of an user providing a new non-serializable subtype of List.
* | | | Eliminated the accumulated feature warnings.Paul Phillips2013-04-233-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No, this isn't busywork, how dare you suggest such a thing. I intend my tombstone to say HERE LIES EXTEMPORE, WHO ELIMINATED A LOT OF SIP-18 WARNINGS REST IN PEACE
* | | | Eliminate a pile of -Xlint warnings.Paul Phillips2013-04-231-1/+1
|/ / / | | | | | | | | | | | | | | | Some unused private code, unused imports, and points where an extra pair of parentheses is necessary for scalac to have confidence in our intentions.
* | | Merge pull request #2284 from demobox/add-box-unbox-doc-commentJason Zaugg2013-04-239-0/+39
|\ \ \ | | | | | | | | SI-6898 Document AnyVal box and unbox implemention by BoxesRunTime
| * | | SI-6898 Document AnyVal box and unbox implemention by BoxesRunTimeAndrew Phillips2013-04-228-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | - Added @boxRunTimeDoc@ and @unboxRunTimeDoc@ tokens to AnyVals - Doc comments refer to BoxesRunTime.java in the Scala repo - No comment for Unit
| * | | Reverting changes to AnyVals generated classes in 9a82fc0Andrew Phillips2013-04-223-0/+7
| | | | | | | | | | | | | | | | - Since the generator was not changed, the classes no longer represent the generated versions
* | | | Merge pull request #2360 from ihji/bugfix/SI-7080Jason Zaugg2013-04-212-6/+15
|\ \ \ \ | | | | | | | | | | SI-7080 improve boundary value checking for BitSet
| * | | | SI-7080 improve boundary value checking for BitSetHeejong Lee2013-04-072-6/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When BitSet accepts a very large integer such as Int.MaxValue, integer overflow possibly occurs in the calculation of boundary value "nwords * WordLength". This faulty boundary condition causes empty-iterator problem like following: scala> import collection.mutable.BitSet import collection.mutable.BitSet scala> val x = BitSet(Int.MaxValue) x: scala.collection.mutable.BitSet = BitSet() scala> x.iterator res0: Iterator[Int] = empty iterator
* | | | Merge pull request #2398 from huitseeker/silence_scaladoc_betterJason Zaugg2013-04-211-1/+1
|\ \ \ \ | | | | | | | | | | Change unrecognized scaladoc comments to C-style
| * | | | Change unrecognized scaladoc comments to C-styleFrançois Garillot2013-04-161-1/+1
| |/ / /
* | | | Fixed BigDecimal documentation for primitive conversion methods.Alden Torres2013-04-211-4/+4
| | | |
* | | | Merge pull request #2336 from retronym/topic/deprecated-inheritance-tweakAdriaan Moors2013-04-151-1/+2
|\ \ \ \ | | | | | | | | | | SI-7312 @deprecatedInheritance now ignores same-file subclasses