[scala] branch upstream updated (fe0c68f -> a22589a)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Jun 5 22:48:53 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a change to branch upstream
in repository scala.

      from  fe0c68f   Imported Upstream version 2.10.4+dfsg
       new  a22589a   Imported Upstream version 2.10.5

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bincompat-backward.whitelist.conf                  |     6 +
 bincompat-forward.whitelist.conf                   |    22 +
 build.number                                       |     2 +-
 scripts/common                                     |   153 +
 scripts/jobs/integrate/bootstrap                   |   150 +
 scripts/jobs/integrate/ide                         |    35 +
 scripts/jobs/validate/publish-core                 |    42 +
 scripts/jobs/validate/test                         |    17 +
 scripts/readproperties.awk                         |    39 +
 scripts/repositories-scala-release                 |     7 +
 .../scala/reflect/macros/runtime/Typers.scala      |    16 +-
 src/compiler/scala/tools/nsc/ast/TreeInfo.scala    |    10 +
 .../scala/tools/nsc/ast/parser/MarkupParsers.scala |    11 +-
 .../scala/tools/nsc/ast/parser/Scanners.scala      |     4 +-
 .../scala/tools/nsc/doc/html/resource/lib/index.js |     2 +-
 .../tools/nsc/doc/html/resource/lib/jquery-ui.js   | 14742 ++++++++++++++++++-
 .../tools/nsc/doc/html/resource/lib/jquery.js      |  9442 +++++++++++-
 .../nsc/doc/html/resource/lib/modernizr.custom.js  |  1267 +-
 .../tools/nsc/doc/html/resource/lib/raphael-min.js |  5807 +++++++-
 .../nsc/doc/html/resource/lib/tools.tooltip.js     |   372 +-
 .../scala/tools/nsc/settings/ScalaSettings.scala   |     1 +
 .../nsc/symtab/classfile/ClassfileParser.scala     |    10 +-
 .../scala/tools/nsc/typechecker/Macros.scala       |    33 +-
 .../scala/tools/nsc/typechecker/Namers.scala       |     5 +-
 .../tools/nsc/typechecker/NamesDefaults.scala      |     6 +-
 .../scala/tools/nsc/typechecker/RefChecks.scala    |    35 +-
 .../scala/tools/nsc/typechecker/Typers.scala       |     2 +-
 .../scala/tools/reflect/ToolBoxFactory.scala       |   203 +-
 src/library/scala/concurrent/Promise.scala         |     7 +-
 src/library/scala/runtime/SeqCharSequence.scala    |     7 +-
 src/library/scala/util/matching/Regex.scala        |   477 +-
 .../util/parsing/combinator/RegexParsers.scala     |     4 +-
 .../util/parsing/combinator/SubSequence.scala      |    32 +
 .../scala/xml/parsing/MarkupParserCommon.scala     |     3 +-
 src/library/scala/xml/parsing/TokenTests.scala     |    56 +-
 src/library/scala/xml/pull/XMLEventReader.scala    |     9 +-
 .../scala/reflect/internal/AnnotationInfos.scala   |     2 +-
 src/reflect/scala/reflect/internal/TreeInfo.scala  |     5 +
 src/reflect/scala/reflect/internal/Trees.scala     |    17 +-
 src/reflect/scala/reflect/internal/Types.scala     |    89 +-
 .../scala/reflect/runtime/JavaMirrors.scala        |    11 +-
 test/files/jvm/future-spec/PromiseTests.scala      |    77 +-
 test/files/jvm/t8689.check                         |     1 +
 test/files/jvm/t8689.scala                         |    13 +
 test/files/jvm/unittest_xml.scala                  |     4 +-
 test/files/neg/t3873.check                         |     4 +-
 test/files/neg/t3873.scala                         |     2 +-
 test/files/neg/t5923c.check                        |     4 +
 test/files/neg/t5923c/Macros_1.scala               |    39 +
 test/files/neg/t5923c/Test_2.scala                 |    12 +
 test/files/neg/t7756a.check                        |     7 +
 test/files/neg/t7756a.flags                        |     1 +
 test/files/neg/t7756a.scala                        |    11 +
 test/files/neg/t7756b.check                        |     4 +
 test/files/neg/t7756b.flags                        |     1 +
 test/files/neg/t7756b.scala                        |     5 +
 test/files/pos/t7753.scala                         |    36 +
 test/files/pos/t7756b.scala                        |    13 +
 test/files/pos/t8223.scala                         |    29 +
 test/files/pos/{classtag-pos.flags => t8596.flags} |     0
 test/files/pos/t8596.scala                         |     7 +
 test/files/presentation/t7915.check                |    20 +
 test/files/presentation/t7915/src/Foo.scala        |     4 +-
 test/files/run/macro-vampire-false-warning.check   |     2 +
 .../macro-vampire-false-warning.flags}             |     0
 .../run/macro-vampire-false-warning/Macros_1.scala |    52 +
 .../run/macro-vampire-false-warning/Test_2.scala   |     6 +
 test/files/run/t4339.check                         |     3 +
 test/files/run/t4339.scala                         |    35 +
 .../run/{t5923a.check => t5923a-fundep.check}      |     0
 test/files/run/t5923a-fundep.flags                 |     1 +
 test/files/run/t5923a-fundep/Macros_1.scala        |    52 +
 .../run/{t5923a => t5923a-fundep}/Test_2.scala     |     0
 .../run/{t5923a.check => t5923a-nofundep.check}    |     0
 .../run/{t5923a => t5923a-nofundep}/Macros_1.scala |     0
 .../run/{t5923a => t5923a-nofundep}/Test_2.scala   |     0
 test/files/run/t5923c.check                        |     1 +
 test/files/run/t5923c.flags                        |     1 +
 test/files/run/t5923c/Macros_1.scala               |    39 +
 test/files/run/t5923c/Test_2.scala                 |    12 +
 .../src/test-1.scala => files/run/t5923d.check}    |     0
 test/files/run/t5923d/Macros_1.scala               |     9 +
 test/files/run/t5923d/Test_2.scala                 |     7 +
 test/files/run/t7871.check                         |     1 +
 test/files/run/t7871/Macros_1.scala                |    43 +
 test/files/run/t7871/Test_2.scala                  |     6 +
 test/files/run/t8196.check                         |     3 +
 test/files/run/t8196.scala                         |    51 +
 test/files/run/{t7439.check => t8442.check}        |     0
 test/files/run/t8442/A_1.java                      |     4 +
 test/files/run/t8442/B_1.java                      |     3 +
 test/files/run/t8442/C_2.scala                     |     5 +
 test/files/run/t8442/Test.scala                    |    29 +
 .../src/test-1.scala => files/run/typecheck.check} |     0
 test/files/run/typecheck/Macros_1.scala            |    17 +
 test/files/run/typecheck/Test_2.scala              |    15 +
 .../run/{SI-3314-diagrams.check => SI-8479.check}  |     0
 test/scaladoc/run/SI-8479.scala                    |    32 +
 test/scaladoc/run/t8314.check                      |     3 +
 test/scaladoc/run/t8314.scala                      |    16 +
 100 files changed, 33468 insertions(+), 434 deletions(-)
 create mode 100644 scripts/common
 create mode 100755 scripts/jobs/integrate/bootstrap
 create mode 100755 scripts/jobs/integrate/ide
 create mode 100755 scripts/jobs/validate/publish-core
 create mode 100755 scripts/jobs/validate/test
 create mode 100644 scripts/readproperties.awk
 create mode 100644 scripts/repositories-scala-release
 mode change 100755 => 100644 src/compiler/scala/tools/nsc/doc/html/resource/lib/jquery-ui.js
 create mode 100644 src/library/scala/util/parsing/combinator/SubSequence.scala
 create mode 100644 test/files/jvm/t8689.check
 create mode 100644 test/files/jvm/t8689.scala
 create mode 100644 test/files/neg/t5923c.check
 create mode 100644 test/files/neg/t5923c/Macros_1.scala
 create mode 100644 test/files/neg/t5923c/Test_2.scala
 create mode 100644 test/files/neg/t7756a.check
 create mode 100644 test/files/neg/t7756a.flags
 create mode 100644 test/files/neg/t7756a.scala
 create mode 100644 test/files/neg/t7756b.check
 create mode 100644 test/files/neg/t7756b.flags
 create mode 100644 test/files/neg/t7756b.scala
 create mode 100644 test/files/pos/t7753.scala
 create mode 100644 test/files/pos/t7756b.scala
 create mode 100644 test/files/pos/t8223.scala
 copy test/files/pos/{classtag-pos.flags => t8596.flags} (100%)
 create mode 100644 test/files/pos/t8596.scala
 create mode 100644 test/files/run/macro-vampire-false-warning.check
 copy test/files/{disabled/t7020.flags => run/macro-vampire-false-warning.flags} (100%)
 create mode 100644 test/files/run/macro-vampire-false-warning/Macros_1.scala
 create mode 100644 test/files/run/macro-vampire-false-warning/Test_2.scala
 create mode 100644 test/files/run/t4339.check
 create mode 100644 test/files/run/t4339.scala
 copy test/files/run/{t5923a.check => t5923a-fundep.check} (100%)
 create mode 100644 test/files/run/t5923a-fundep.flags
 create mode 100644 test/files/run/t5923a-fundep/Macros_1.scala
 copy test/files/run/{t5923a => t5923a-fundep}/Test_2.scala (100%)
 rename test/files/run/{t5923a.check => t5923a-nofundep.check} (100%)
 rename test/files/run/{t5923a => t5923a-nofundep}/Macros_1.scala (100%)
 rename test/files/run/{t5923a => t5923a-nofundep}/Test_2.scala (100%)
 create mode 100644 test/files/run/t5923c.check
 create mode 100644 test/files/run/t5923c.flags
 create mode 100644 test/files/run/t5923c/Macros_1.scala
 create mode 100644 test/files/run/t5923c/Test_2.scala
 copy test/{ant/test-basic/src/test-1.scala => files/run/t5923d.check} (100%)
 create mode 100644 test/files/run/t5923d/Macros_1.scala
 create mode 100644 test/files/run/t5923d/Test_2.scala
 create mode 100644 test/files/run/t7871.check
 create mode 100644 test/files/run/t7871/Macros_1.scala
 create mode 100644 test/files/run/t7871/Test_2.scala
 create mode 100644 test/files/run/t8196.check
 create mode 100644 test/files/run/t8196.scala
 copy test/files/run/{t7439.check => t8442.check} (100%)
 create mode 100644 test/files/run/t8442/A_1.java
 create mode 100644 test/files/run/t8442/B_1.java
 create mode 100644 test/files/run/t8442/C_2.scala
 create mode 100644 test/files/run/t8442/Test.scala
 copy test/{ant/test-basic/src/test-1.scala => files/run/typecheck.check} (100%)
 create mode 100644 test/files/run/typecheck/Macros_1.scala
 create mode 100644 test/files/run/typecheck/Test_2.scala
 copy test/scaladoc/run/{SI-3314-diagrams.check => SI-8479.check} (100%)
 create mode 100755 test/scaladoc/run/SI-8479.scala
 create mode 100644 test/scaladoc/run/t8314.check
 create mode 100644 test/scaladoc/run/t8314.scala

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala.git



More information about the pkg-java-commits mailing list