[Pkg-scala-commits] [scala] 06/15: Merge tag 'upstream/2.10.3+dfsg'
Mehdi Dogguy
mehdi at moszumanska.debian.org
Wed Apr 23 21:31:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository scala.
commit 81f447c1d896ca752e3a11536081fcc73c56814f
Merge: f812495 d1c5a34
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Wed Apr 23 19:14:57 2014 +0200
Merge tag 'upstream/2.10.3+dfsg'
Upstream version 2.10.3+dfsg
.gitignore | 48 +
bincompat-backward.whitelist.conf | 92 +
bincompat-forward.whitelist.conf | 964 +++++++
build.number | 2 +-
build.xml | 120 +-
docs/LICENSE | 56 +-
gitignore.SAMPLE | 35 -
.../scala/actors/scheduler/ThreadPoolConfig.scala | 5 +-
src/build/maven/maven-deploy.xml | 6 +-
.../scala/reflect/macros/runtime/Typers.scala | 2 +-
src/compiler/scala/reflect/reify/package.scala | 7 +-
.../scala/reflect/reify/phases/Reshape.scala | 16 +-
.../scala/tools/ant/templates/tool-windows.tmpl | 70 +-
.../scala/tools/nsc/ast/parser/Parsers.scala | 13 +-
.../scala/tools/nsc/ast/parser/TreeBuilder.scala | 6 +
.../scala/tools/nsc/interpreter/ILoop.scala | 35 +-
.../nsc/symtab/classfile/ClassfileParser.scala | 24 +-
.../scala/tools/nsc/transform/Constructors.scala | 5 +-
.../scala/tools/nsc/transform/Erasure.scala | 5 -
.../tools/nsc/transform/ExtensionMethods.scala | 7 +-
src/compiler/scala/tools/nsc/transform/Mixin.scala | 2 +-
.../tools/nsc/transform/SpecializeTypes.scala | 150 +-
.../scala/tools/nsc/transform/patmat/Solving.scala | 9 +-
.../tools/nsc/typechecker/ContextErrors.scala | 2 +-
.../scala/tools/nsc/typechecker/Duplicators.scala | 21 +-
.../scala/tools/nsc/typechecker/Macros.scala | 8 +-
.../scala/tools/nsc/typechecker/Namers.scala | 7 +-
.../tools/nsc/typechecker/NamesDefaults.scala | 9 +-
.../scala/tools/nsc/typechecker/RefChecks.scala | 63 +-
.../tools/nsc/typechecker/TypeDiagnostics.scala | 11 +-
.../scala/tools/nsc/typechecker/Typers.scala | 20 +-
src/compiler/scala/tools/nsc/util/ClassPath.scala | 5 +-
.../scala/tools/nsc/util/MsilClassPath.scala | 3 +-
.../scala/tools/reflect/ToolBoxFactory.scala | 17 +-
.../scala/tools/reflect/WrappedProperties.scala | 8 +-
src/compiler/scala/tools/util/Javap.scala | 2 +-
src/eclipse/README.md | 3 +
src/eclipse/test-junit/.classpath | 12 +
src/eclipse/test-junit/.project | 35 +
.../scala/collection/concurrent/TrieMap.scala | 7 +-
src/library/scala/collection/mutable/MapLike.scala | 4 +-
src/library/scala/collection/mutable/SetLike.scala | 4 +-
src/library/scala/concurrent/Future.scala | 195 +-
src/library/scala/concurrent/impl/Promise.scala | 275 +-
src/library/scala/math/BigDecimal.scala | 2 +-
src/library/scala/math/BigInt.scala | 2 +-
src/library/scala/runtime/ScalaRunTime.scala | 66 +-
src/library/scala/util/Properties.scala | 51 +-
src/partest/scala/tools/partest/DirectTest.scala | 27 +
src/partest/scala/tools/partest/PartestTask.scala | 5 +-
.../scala/reflect/internal/CapturedVariables.scala | 2 +-
.../reflect/internal/ClassfileConstants.scala | 36 +-
.../scala/reflect/internal/Definitions.scala | 13 +-
.../reflect/internal/ExistentialsAndSkolems.scala | 9 +-
src/reflect/scala/reflect/internal/HasFlags.scala | 3 +
src/reflect/scala/reflect/internal/Importers.scala | 7 +-
src/reflect/scala/reflect/internal/Printers.scala | 2 +
.../scala/reflect/internal/StdAttachments.scala | 31 +
src/reflect/scala/reflect/internal/StdNames.scala | 1 +
.../scala/reflect/internal/SymbolTable.scala | 13 +-
src/reflect/scala/reflect/internal/Trees.scala | 7 +-
src/reflect/scala/reflect/internal/Types.scala | 22 +-
.../internal/annotations/uncheckedBounds.scala | 13 +
.../scala/reflect/internal/util/WeakHashSet.scala | 453 ++-
.../scala/reflect/runtime/JavaMirrors.scala | 44 +-
.../scala/reflect/runtime/ReflectionUtils.scala | 6 +
.../scala/reflect/runtime/SymbolLoaders.scala | 11 +-
test/files/{gitignore.SAMPLE => .gitignore} | 0
test/files/jvm/duration-tck.scala | 5 +-
test/files/jvm/scala-concurrent-tck.scala | 562 +---
test/files/neg/macro-abort.check | 4 +
test/files/neg/macro-abort/Macros_1.scala | 9 +
test/files/neg/macro-abort/Test_2.scala | 3 +
test/files/neg/macro-exception.check | 7 +
test/files/neg/macro-exception/Macros_1.scala | 9 +
test/files/neg/macro-exception/Test_2.scala | 3 +
...verride-macro-overrides-abstract-method-b.check | 16 +-
.../Impls_Macros_1.scala | 17 +-
.../Test_2.scala | 6 +-
test/files/neg/t6138.check | 7 +
test/files/neg/t6138.scala | 5 +
test/files/neg/t7020.check | 17 +
test/files/neg/t7020.flags | 1 +
test/files/neg/t7020.scala | 30 +
test/files/neg/t7473.check | 7 +
test/files/neg/t7473.scala | 7 +
test/files/neg/t7507.check | 4 +
test/files/neg/t7507.scala | 7 +
test/files/neg/t7636.check | 10 +
test/files/neg/t7636.scala | 7 +
test/files/neg/t7694b.check | 7 +
test/files/neg/t7752.check | 27 +
test/files/neg/t7752.scala | 26 +
.../files/neg/valueclasses-impl-restrictions.check | 8 +-
.../files/neg/valueclasses-impl-restrictions.scala | 4 +-
test/files/pos/SI-7638.scala | 51 +
test/files/pos/lub-dealias-widen.scala | 34 +
test/files/pos/t4760.scala | 34 +
test/files/pos/t7014/ThreadSafety.java | 9 +
test/files/pos/t7014/ThreadSafetyLevel.java | 8 +
test/files/pos/t7014/t7014.scala | 4 +
test/files/pos/t7461.check | 0
test/files/pos/t7461/Macros_1.scala | 13 +
test/files/pos/t7461/Test_2.scala | 3 +
test/files/pos/t7486-named.scala | 8 +
test/{pending => files}/pos/t7486.scala | 0
test/files/pos/t7505.scala | 16 +
test/files/pos/t7649.flags | 1 +
test/files/pos/t7649.scala | 20 +
test/files/pos/t7694.scala | 40 +
test/files/pos/t7716.scala | 16 +
test/files/pos/t7782.scala | 25 +
test/files/pos/t7782b.scala | 25 +
test/files/pos/t7818.scala | 10 +
test/files/pos/t942/Amount_1.java | 5 +
test/files/pos/t942/Test_2.scala | 3 +
test/files/run/WeakHashSetTest.scala | 174 ++
test/files/run/classfile-format-51.scala | 8 +-
test/files/run/classfile-format-52.check | 2 +
test/files/run/classfile-format-52.scala | 77 +
test/files/run/future-flatmap-exec-count.check | 6 +
test/files/run/future-flatmap-exec-count.scala | 61 +
test/files/run/macro-auto-duplicate.check | 1 +
test/files/run/macro-auto-duplicate/Macros_1.scala | 17 +
test/files/run/macro-auto-duplicate/Test_2.scala | 3 +
test/files/run/macro-duplicate.check | 0
test/files/run/macro-duplicate.flags | 1 +
.../files/run/macro-duplicate/Impls_Macros_1.scala | 29 +
test/files/run/macro-duplicate/Test_2.scala | 6 +
test/files/run/predef-cycle.scala | 71 +
.../files/run/reflection-magicsymbols-invoke.check | 2 +-
test/files/run/t6392b.check | 2 +-
test/files/run/t6481.check | 4 +
test/files/run/t6481.scala | 13 +
test/files/run/t6989.check | 24 +
test/files/run/t7265.scala | 27 +
test/files/run/t7269.scala | 32 +
test/files/run/t7331a.check | 2 +
test/files/run/t7331a.scala | 10 +
test/files/run/t7331b.check | 3 +
test/files/run/t7331b.scala | 11 +
test/files/run/t7331c.check | 3 +
test/files/run/t7331c.scala | 11 +
test/files/run/t7336.scala | 31 +
test/files/run/t7375a.check | 4 +
test/files/run/t7375a.scala | 16 +
test/files/run/t7375b.check | 4 +
test/files/run/t7375b/Macros_1.scala | 18 +
test/files/run/t7375b/Test_2.scala | 3 +
test/files/run/t7398.scala | 11 +-
test/files/run/t7455.check | 4 +
test/files/run/t7455/Outer.java | 31 +
test/files/run/t7455/Test.scala | 30 +
test/files/run/t7498.scala | 20 +
test/files/run/t7507.scala | 31 +
test/files/run/t7510.check | 0
test/files/run/t7510/Ann_1.java | 4 +
test/files/run/t7510/Test_2.scala | 9 +
test/files/run/t7556.check | 2 +
test/files/run/t7556/Test_2.scala | 11 +
test/files/run/t7556/mega-class_1.scala | 3002 ++++++++++++++++++++
test/files/run/t7558.scala | 9 +
test/files/run/t7569.check | 12 +
test/files/run/t7569.scala | 19 +
test/files/run/t7571.scala | 12 +
test/files/run/t7617a.check | 2 +
test/files/run/t7617a/Macros_1.scala | 22 +
test/files/run/t7617a/Test_2.scala | 5 +
test/files/run/t7617b.check | 1 +
test/files/run/t7617b/Macros_1.scala | 8 +
test/files/run/t7617b/Test_2.scala | 11 +
test/files/run/t7657.check | 3 +
test/files/run/t7657/Macros_1.scala | 8 +
test/files/run/t7657/Test_2.scala | 6 +
test/files/run/t7733.check | 1 +
test/files/run/t7733/Separate_1.scala | 5 +
test/files/run/t7733/Test_2.scala | 9 +
test/files/run/t7775.scala | 17 +
test/files/run/t7779.scala | 67 +
test/files/run/t7825.scala | 34 +
test/files/run/toolbox_current_run_compiles.check | 2 +
test/files/run/toolbox_current_run_compiles.scala | 28 +
test/files/run/typed-annotated.check | 1 +
test/files/run/typed-annotated/Macros_1.scala | 17 +
test/files/run/typed-annotated/Test_2.scala | 3 +
test/files/specialized/SI-7343.scala | 55 +
test/files/specialized/SI-7344.scala | 53 +
test/files/specialized/spec-ame.check | 2 +-
test/files/specialized/spec-ame.scala | 3 +
test/instrumented/boxes.patch | 2 +-
.../library/scala/runtime/BoxesRunTime.java | 7 +-
.../library/scala/runtime/ScalaRunTime.scala | 100 +-
test/instrumented/srt.patch | 65 +-
.../scala/concurrent/impl/DefaultPromiseTest.scala | 344 +++
test/junit/scala/runtime/ScalaRunTimeTest.scala | 70 +
test/junit/scala/tools/nsc/SampleTest.scala | 17 +
test/pending/junit/scala/util/t7265.scala | 46 +
test/pending/pos/t7778/Foo_1.java | 6 +
test/pending/pos/t7778/Test_2.scala | 3 +
test/scaladoc/run/t7767.check | 1 +
test/scaladoc/run/t7767.scala | 18 +
tools/binary-repo-lib.sh | 2 +-
202 files changed, 8104 insertions(+), 1179 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-scala/packages/scala.git
More information about the Pkg-scala-commits
mailing list