diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2016-01-29 15:22:51 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2016-01-29 15:36:41 +0000 |
| commit | fbd8333bbe73c03242d69815d6dceee333662f90 (patch) | |
| tree | a765b2001fd27e4f5ee7ead4bad2678cde9ad8e4 /src/main/java/com/google/devtools/build/lib/syntax/ListComprehension.java | |
| parent | 734e7f7b63c9c00a6aaa60769481a11bc4f76346 (diff) | |
Rollback of commit c0a8c58b9230a1f5d76269eb7dc6b11e18f19686.
*** Reason for rollback ***
Break Java 1.7 builds of Bazel.
See http://ci.bazel.io/job/Bazel/JAVA_VERSION=1.7,PLATFORM_NAME=linux-x86_64/327/console
Test:
git clone ... && git revert c0a8c58 && export JAVA_VERSION=1.7 && export BAZEL_COMPILE_TARGET=compile && bash -c "source scripts/ci/build.sh; bazel_build"
*** Original change description ***
Make Skylark dicts mutable
Represent Skylark dict using a new subclass SkylarkDict<K, V> of Map<K, V>.
Back it with a TreeMap to provide a deterministic iteration order.
Also make SkylarkList generic in its element type <E>.
Have Artifact implement Comparable<Object> so it can be used as TreeMap key.
--
MOS_MIGRATED_REVID=113359718
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/syntax/ListComprehension.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/ListComprehension.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/ListComprehension.java b/src/main/java/com/google/devtools/build/lib/syntax/ListComprehension.java index cfcbe12a97..749b056f84 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/ListComprehension.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/ListComprehension.java @@ -48,7 +48,7 @@ public final class ListComprehension extends AbstractComprehension { } @Override - OutputCollector createCollector(Environment env) { + OutputCollector createCollector() { return new ListOutputCollector(); } |