summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Windows CI: don't hardcode Ant path quite so hardSeth Tisue2015-10-091-1/+5
| | |
| * | add note to readme about Windows buildSeth Tisue2015-10-081-0/+2
| | |
| * | add comment about Cygwin trouble to test/partestSeth Tisue2015-10-081-0/+8
| | |
| * | add experimental Windows script for testingSeth Tisue2015-10-081-0/+11
| | | | | | | | | | | | experimental for now. destined to be automated via scala-jenkins-infra
| * | Windows: make get-scala-commit-sha/date scripts work on CygwinSeth Tisue2015-10-082-4/+4
| | | | | | | | | | | | | | | | | | bash's -x flag was flowing down into these scripts, resulting in extra stuff was getting printed to stderr, resulting in a corrupted build\pack\META-INF\MANIFEST.MF
| * | fix t7634 to work on CygwinSeth Tisue2015-10-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this was failing because the expected output was: res1: List[String] = List(shello, world.) but the actual output was: res1: List[String] = List(shello, world., Picked up _JAVA_OPTIONS: -Duser.home=y:\jenkins) but the "Picked up..." part caused partest's filters feature to ignore the entire line (it doesn't anchor matches to start of line.) This was a tough one to track down.
* | | Merge pull request #4800 from sjrd/remove-lingering-printlnLukas Rytz2015-10-212-4/+1
|\ \ \ | |_|/ |/| | Remove two lingering `println`s in non-debug methods of the library.
| * | Remove two lingering `println`s in non-debug methods of the library.Sébastien Doeraene2015-10-132-4/+1
| |/
* | Merge pull request #4792 from SethTisue/round-of-readme-updatesLukas Rytz2015-10-164-45/+36
|\ \ | | | | | | misc upgrades to README
| * | more readme improvementsSeth Tisue2015-10-084-36/+31
| | | | | | | | | | | | | | | | | | * be clearer about required JDK versions * eliminate redundancy with existing src/eclipse and src/intellij readmes * give IntelliJ readme a .md extension
| * | misc upgrades to READMESeth Tisue2015-10-071-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | * link to new scala/contributors room on Gitter * remove link to old disused CI * replace list of mailing lists with single link to community page * link to 2.12 nightlies too, not just 2.11 * update required JDK version info
* | | Merge pull request #4791 from performantdata/issue/9508Lukas Rytz2015-10-158-47/+17
|\ \ \ | | | | | | | | SI-9508 fix classpaths in Eclipse configuration
| * | | SI-9508 fix classpaths in Eclipse configurationPerformant Data LLC2015-10-128-47/+17
| | |/ | |/|
* | | Merge pull request #4798 from performantdata/issue/9513Seth Tisue2015-10-152-1/+60
|\ \ \ | | | | | | | | SI-9513 decrement "deleted" count in OpenHashMap.put() when slot reused
| * | | Suppress unneeded import.Performant Data LLC2015-10-141-2/+2
| | | |
| * | | 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-102-1/+47
| |/ /
* | | 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
| | |/ | |/|
* | | Merge pull request #4771 from som-snytt/issue/9492-hereSeth Tisue2015-10-144-16/+83
|\ \ \ | | | | | | | | SI-9492 REPL paste here doc
| * | | SI-9492 Line trimming pasteSom Snytt2015-09-272-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `-` stripmargin character to indicate trim (i.e. remove leading indentation). `<<` looks more like shift left, but is already the standard here doc sequence. Indentation is often mangled by pasting, so trimming normalizes lines for error messages. The entire paste text was already trimmed as a whole. `-Dscala.repl.here` provides a default end string, which is unset unless specified. ``` scala> :pa <- // Entering paste mode (ctrl-D to finish) def g = 10 def f! = 27 -- // Exiting paste mode, now interpreting. <console>:2: error: '=' expected but identifier found. def f! = 27 ^ ```
| * | | SI-9492 REPL paste here docSom Snytt2015-09-273-16/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple here documentish syntax for REPL paste. This makes it easier to paste a block of script (as opposed to transcript). It also means you won't accidentally ctl-D out of the REPL and then out of SBT and then out of the terminal window. ``` scala> :paste < EOF // Entering paste mode (EOF to finish) class C { def c = 42 } EOF // Exiting paste mode, now interpreting. defined class C scala> new C().c res0: Int = 42 scala> :paste <| EOF // Entering paste mode (EOF to finish) |class D { def d = 42 } EOF // Exiting paste mode, now interpreting. defined class D scala> new D().d res1: Int = 42 scala> :quit ```
* | | | Merge pull request #4610 from todesking/spec-implicits-remove-obsoleteSeth Tisue2015-10-141-2/+10
|\ \ \ \ | | | | | | | | | | Spec: Implicit parameters with context/view bound is allowed since 2.10
| * | | | Add view/context-bound parameter ordering ruletodesking2015-09-241-0/+10
| | | | |
| * | | | Spec: Implicit parameters with context/view bound is allowed since 2.10todesking2015-07-081-2/+0
| | | | |
* | | | | Merge pull request #4789 from janekdb/2.11.x-param-names-predicates-operationsSeth Tisue2015-10-139-71/+86
|\ \ \ \ \ | |_|_|_|/ |/| | | | Rename forall, exists and find predicate and operator params.
| * | | | 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.
* | | | Merge pull request #4790 from SethTisue/issue/9501Seth Tisue2015-10-071-1/+10
|\ \ \ \ | | | | | | | | | | SI-9501 link README to Scala Hacker Guide
| * | | | SI-9501 link README to Scala Hacker GuideSeth Tisue2015-10-061-1/+10
| | |_|/ | |/| |
* | | | Merge pull request #4786 from performantdata/issue/9506Jason Zaugg2015-10-079-0/+18
|\ \ \ \ | |/ / / |/| | | SI-9506 suppress Scala IDE-generated files in the Eclipse project dirs
| * | | SI-9506 suppress Scala IDE-generated files in the Eclipse project dirsPerformant Data LLC2015-10-062-0/+4
| | | |
| * | | SI-9506 suppress Scala IDE-generated files in the Eclipse project dirsPerformant Data LLC2015-10-057-0/+14
|/ / /
* | | Merge pull request #4782 from performantdata/issue/9502Lukas Rytz2015-10-051-3/+3
|\ \ \ | | | | | | | | SI-9502 Update Eclipse classpaths for scaladoc project.
| * | | SI-9502 Update Eclipse classpaths for scaladoc project.Michael2015-10-021-3/+3
| | | |
* | | | Merge pull request #4770 from SethTisue/windows-testing-fixesLukas Rytz2015-10-055-17/+37
|\ \ \ \ | | | | | | | | | | get test suite passing on Windows
| * | | | add missing newline at eof in Scala sourceSeth Tisue2015-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this was causing a mysterious compilation failure on Windows. (it may not have been a sufficient cause in itself -- which is why I say "mysterious" -- but in any case, adding the newline made the failure go away. and besides, the newline should be there. so here it is.) (it's tempting to make a big commit that fixes this in every source file. resisting for now)
| * | | | fix bug in partest-extras causing test failures on WindowsSeth Tisue2015-09-251-2/+7
| | | | | | | | | | | | | | | | | | | | includes comment with full details
| * | | | fix bug where -Xprint-icode leaked an InputStream and a file handleSeth Tisue2015-09-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usually it hardly matters, but it's still a bug, and on Windows we can't delete an open file, so this can cause trouble for someone writing a test that relies on being able to generate icode files and then clean them up afterwards. (and in fact, two IcodeComparison-based tests were failing.)
| * | | | add comments warning of InputStream leaks in scala.io.reflectSeth Tisue2015-09-251-0/+8
| | | | |
| * | | | SI-9472 make Git use LF line endings on WindowsSeth Tisue2015-09-251-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is mostly intended for .scala files, since because """ preserves line endings, so we get different results if source files have CRLF. this was making a few tests fail on Windows (because they used """ to enclose expected output)
* | | | | Merge pull request #4776 from SethTisue/spec-8.3-tweakLukas Rytz2015-10-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | tiny fix to spec (pattern matching section)
| * | | | | tiny fix to spec (pattern matching section)Seth Tisue2015-09-301-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4777 from retronym/ticket/ide-1002552Lukas Rytz2015-10-051-1/+6
|\ \ \ \ \ | | | | | | | | | | | | Improve implicits wildcard imports in the IDE
| * | | | | Improve implicits wildcard imports in the IDEJason Zaugg2015-09-301-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 451cab967a, I changed handling of selection of members from package objects so as to correctly use `somePackage.package.type` as the prefix, rather than `somePackage`. This fixed generic substitution for members inherited from superclasses of the package object. However, this has subtly changed the scope from which we collect implicits given a wildcard import. It seems that the IDE gets into a situation after a scaladoc lookup, which temporarily typechecks the sources of a package object of a third party library, in which the members of package object differ from the members of the enclosing package. The upshot of this was spurious type errors due to implicit search discarding an candidate implicit whose symbol is not matched by typechecking an identifier with the symbol's name at the implicit usage site (this is how we discard shadowed implicits.) I'd like to ge to the bottom of this, but in the meantime, I've found that we can fix the regression by looking up the implicit member symbols in the package, even while correctly using the package object as the prefix.
* | | | | | Merge pull request #4781 from pauldraper/pauldraper-future-sequence-2.11Lukas Rytz2015-10-051-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Avoid using ExecutionContext for Future.sequence of empty collection
| * | | | | 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.
* | | | | Merge pull request #4775 from SethTisue/issue/9495Jason Zaugg2015-09-301-0/+4
|\ \ \ \ \ | |/ / / / |/| | | | SI-9495 Add note about configuring Ant for HTTP proxies
| * | | | SI-9495 Add note about configuring Ant for HTTP proxiesSeth Tisue2015-09-301-0/+4
| |/ / /
* | | | Merge pull request #4773 from ryanus/process-typoSeth Tisue2015-09-291-2/+2
|\ \ \ \ | | | | | | | | | | Fix typo in Process.scala
| * | | | Fix typo in Process.scalaRyan Zhang2015-09-291-2/+2
|/ / / /