summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve List creation in BatchingExecutorJohannes Rudolph2017-03-221-1/+1
| | | It turned up in play profiling.
* Merge pull request #5592 from fommil/jar-open-closeJason Zaugg2017-03-222-18/+70
|\ | | | | SI-9632 don't keep JarFile open in ZipArchive
| * SI-9632 don't keep JarFile open in ZipArchiveSam Halliday2017-02-222-18/+70
| |
* | Merge pull request #5741 from monkey-mas/bump-up-sbt-jmh-to-0.2.21Seth Tisue2017-03-211-1/+1
|\ \ | | | | | | Bump up sbt-jmh to 0.2.21
| * | Bump up sbt-jmh to 0.2.21Masaru Nomura2017-02-251-1/+1
| | | | | | | | | | | | With this change, we'll use JMH 1.17.4.
* | | Merge pull request #5771 from som-snytt/issue/regex-doc-errSeth Tisue2017-03-211-16/+30
|\ \ \ | | | | | | | | Fix and improve Regex doc
| * | | Fix and improve Regex docSom Snytt2017-03-101-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | As reported by @djvulee, there was an error in the example explaining the confusing behavior of `MatchIterator`. It's really confusing.
* | | | Merge pull request #5747 from dwijnand/fix-root-package-taskSeth Tisue2017-03-211-1/+2
|\ \ \ \ | | | | | | | | | | SD-317 Fix package & compiler/package
| * | | | Rewire package to osgiBundle for OSGi-enabled projectsDale Wijnand2017-03-151-1/+2
| | | | | | | | | | | | | | | | | | | | Fixes scala/scala-dev#317.
* | | | | Merge pull request #5791 from SethTisue/cruft-begoneSeth Tisue2017-03-21557-84253/+7
|\ \ \ \ \ | | | | | | | | | | | | remove a bunch of old cruft
| * | | | | remove test/pending directory tooSeth Tisue2017-03-21359-9795/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it will all stay right there in the Git history to be consulted anytime we want...
| * | | | | rm -r test/{flaky,disabled*,checker-tests,support,debug}Seth Tisue2017-03-20188-74446/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keeping this stuff, somewhere, forever and ever and ever is what version control is for. who dares disturb the ancient and accursed tomb of all this code...?
| * | | | | remove orphaned checkfilesSeth Tisue2017-03-203-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | thank you tools/rm-orphan-checkfiles script
| * | | | | remove two empty source filesSeth Tisue2017-03-202-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | noticed by the sharp-eyed @smarter
| * | | | | fix typosSeth Tisue2017-03-204-4/+4
| | | | | |
| * | | | | unset a stray execute bitSeth Tisue2017-03-201-0/+0
| | | | | |
* | | | | | Merge pull request #5776 from lrytz/numbersCleanupSeth Tisue2017-03-211-19/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | cleanups and clarifications in versions.properties
| * | | | | | cleanups and clarifications in versions.propertiesLukas Rytz2017-03-141-19/+19
| | | | | | |
* | | | | | | Merge pull request #5789 from ceeph/patch-1Janek Bogucki2017-03-211-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fix table formatting
| * | | | | | Fix table formattingAlessandro Cifani2017-03-211-1/+1
|/ / / / / /
* | | | | | Merge pull request #5780 from lrytz/bootstrapOverwriteLukas Rytz2017-03-161-14/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use a single repository in the bootstrap job
| * | | | | | Use a single repository in the bootstrap jobLukas Rytz2017-03-151-14/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently, I changed the bootstap script to publish the "locker" build to scala-release-temp and only the bootstrapped "quick" build to scala-integration. This commit reverts back to the previous mechanism where "locker" is published to the same repo (scala-integration) and later overwritten. The reason is that we want to use scala-release-temp for publishing integration builds of commits that are not (yet) merged to scala/scala. Such builds are useful for preliminary testing / benchmarking of PRs / development revisions. This means that we want to add scala-release-temp as a resolver in the community build and the benchmark job. If we have same-named releases in both repos (one "locker", one "quick", so they are not the same), we would not know which one is being picked up. If we want to avoid the overwriting in the future, we could work on a solution that sets a different version number for "locker", but we have to be careful when building the modules; maybe setting the scalaBinaryVersion would be enough.
* | | | | | Merge pull request #5777 from som-snytt/issue/10226Lukas Rytz2017-03-152-5/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-10226 REPL handles paste when colorized
| * | | | | | SI-10226 REPL handles paste when colorizedSom Snytt2017-03-142-5/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Colorization or Colourisation tripped up REPL on paste. Prompt detection should use the plain text prompt, not the ansified prompt. Manual test since .flags doesn't like it: ``` $ ./build/pack/bin/scala -Dscala.repl.prompt="%nhello > " Welcome to Scala 2.12.2-20170314-033334-d0c2620 (Java HotSpot(TM) 64-Bit Server VM, Java 1.8.0_111). Type in expressions for evaluation. Or try :help. hello > 42 res0: Int = 42 hello > hello > 42 // Detected repl transcript. Paste more, or ctrl-D to finish. hello > "wtf?" // Replaying 2 commands from transcript. hello > 42 res1: Int = 42 hello > "wtf?" res2: String = wtf? hello > ```
* | | | | | Merge pull request #5756 from rorygraves/2.12.x_depthboxingJason Zaugg2017-03-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Reduce boxing of scala.reflect.internal.Depth
| * | | | | | Reduce boxing of scala.reflect.internal.DepthRory Graves2017-03-041-1/+1
| | | | | | |
* | | | | | | Merge pull request #5755 from rorygraves/2.12.x_map4Jason Zaugg2017-03-145-8/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve the performance of Map4 to HashMap and Set4 to HashSet transitions
| * | | | | | | Performance improvements for Map4 to HashMap nad Set4 to HashSet transitionsRory Graves2017-03-042-2/+2
| | | | | | | |
| * | | | | | | Add benchmarks for Map4 to HashMap and Set4 to HashSet transitionsRory Graves2017-03-042-0/+58
| | | | | | | |
| * | | | | | | Fix compile error on existing ListBenchmarkRory Graves2017-03-041-6/+4
| | | | | | | |
* | | | | | | | Merge pull request #5675 from piyush-jaiswal/issue/9729som-snytt2017-03-102-2/+175
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Add tests for ConsoleReporter.
| * | | | | | | Add tests for ConsoleReporter.piyush-jaiswal2017-03-112-2/+175
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #5761 from lrytz/sd329Adriaan Moors2017-03-103-7/+91
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't use `equals` for comparing java.lang.Double/Float
| * | | | | | | Don't use `equals` for comparing java.lang.Double/FloatLukas Rytz2017-03-093-7/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/scala/scala-dev/issues/329 The `equals` method for java.lang.Double/Float behaves differently than comparing the `doubleValue`s / `floatValues` for `-0.0`/`0.0`/`NaN`.
* | | | | | | | Merge pull request #5719 from retronym/ticket/10187Adriaan Moors2017-03-102-2/+48
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-10187 Support mutation of mutable.HashMap in getOrElseUpdate
| * | | | | | | | SI-10187 Support mutation of mutable.HashMap in getOrElseUpdateJason Zaugg2017-03-032-2/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scala 2.12.1 included optimizations to `HashMape.getOrElseUpdate` to avoid recomputing the index in the hash table when adding an the element. However, this index could be stale if the callback added elements to the map and triggered a resize. This commit checks that the table is unchanged before reusing the index, restoring the 2.12.0 behaviour.
* | | | | | | | | Merge pull request #5767 from som-snytt/issue/5621Adriaan Moors2017-03-102-2/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | SI-5621 Missing implicits are supplied by defaults
| * | | | | | | | | SI-5621 Missing implicits are supplied by defaultsSom Snytt2017-03-102-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make a note in the examples for default args.
* | | | | | | | | | Merge pull request #5769 from som-snytt/issue/8969Lukas Rytz2017-03-102-2/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | SI-8969 Accept poly+implicit for assignment syntax
| * | | | | | | | | | SI-8969 Accept poly+implicit for assignment syntaxSom Snytt2017-03-092-2/+14
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up to fb061f22d4c35df626d9651e017820a11f8fe56e which allowed the type param only. Reported: ``` scala> object Test { | def a[R](implicit s: List[R]):Int = 0 | def a_=[R](v: Int)(implicit s: List[R]) = () | } ```
* | | | | | | | | | Merge pull request #5766 from lrytz/versionsReadmeSeth Tisue2017-03-091-10/+12
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | Adapt README to new version numbers
| * | | | | | | | | Adapt README to new version numbersLukas Rytz2017-03-091-10/+12
| |/ / / / / / / /
* | | | | | | | | Merge pull request #5765 from lrytz/bootstrapReposLukas Rytz2017-03-091-3/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix for repositories file in bootstrap scripts
| * | | | | | | | Fix for repositories file in bootstrap scriptsLukas Rytz2017-03-091-3/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building quick and modules, the `scala-integrate` repo needs to be there in order to find other modules. For example, partest needs xml. This should fix the 2.13 build, it didn't fail in 2.12 because modules are not built.
* | | | | | | | Merge pull request #5757 from lrytz/bootstrap-scriptLukas Rytz2017-03-085-128/+114
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | new version numbers for snapshot and integration builds, new repository
| * | | | | | | | new version numbers for snapshot and integration builds, new repositoryLukas Rytz2017-03-085-128/+114
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integration builds now have version number like `2.12.2-bin-sha7` or `2.13.0-pre-sha7` and are published to scala-integration (no longer scala-release-temp). scala-release-temp is still used in the bootstrap script for publishing intermediate artifacts (starr, locker). Various cleanups in the scripts.
* | | | | | | | Merge pull request #5733 from szeiger/wip/use-jgitSeth Tisue2017-03-076-72/+33
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Get commit SHA and date with JGit
| * | | | | | | | Get commit SHA and date with JGitStefan Zeiger2017-02-286-72/+33
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to get the SHA and date we used to run shell scripts and parse the output of `git` commands. On Windows we even ran a batch file that looked for `bash.exe` and then ran the shell script in bash. Using JGit should be more robust than the old Rube Goldberg implementation. The values produced are the same, except for the time zone. Previously the timestamp was formatted with the local timezone, now we use UTC.
* | | | | | | | Merge pull request #5600 from paplorinc/HashTable_indexSeth Tisue2017-03-065-18/+21
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Further small HashTable optimizations
| * | | | | | | Optimized HashTable.nextPositivePowerOfTwoPap Lőrinc2017-02-185-18/+21
| | |/ / / / / | |/| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 02:10:38 +0000