aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar Jon Brandvein <brandjon@google.com>2016-07-29 12:51:38 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-07-29 16:01:52 +0000
commitf9bc66571bf738134dc2796249d08b55f240bb63 (patch)
tree9081cbd664491dd2deef82e091d6ad2db1381d86 /src/main
parentfa01f8ed5806a0ef94d8d2665a3b0f7fa1cec37d (diff)
Simplify immutability test
-- MOS_MIGRATED_REVID=128800280
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java12
-rw-r--r--src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java5
2 files changed, 0 insertions, 17 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
index c462098373..4a661896b6 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
@@ -23,7 +23,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.events.Location;
import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
import com.google.devtools.build.lib.skylarkinterface.SkylarkValue;
-import com.google.devtools.build.lib.syntax.SkylarkList.Tuple;
import com.google.devtools.build.lib.syntax.compiler.ByteCodeUtils;
import com.google.devtools.build.lib.util.Preconditions;
import com.google.devtools.build.lib.vfs.PathFragment;
@@ -122,17 +121,6 @@ public final class EvalUtils {
// NB: This is used as the basis for accepting objects in SkylarkNestedSet-s,
// as well as for accepting objects as keys for Skylark dict-s.
public static boolean isImmutable(Object o) {
- if (o instanceof Tuple) {
- for (Object item : (Tuple) o) {
- if (!isImmutable(item)) {
- return false;
- }
- }
- return true;
- }
- if (o instanceof SkylarkMutable) {
- return false;
- }
if (o instanceof SkylarkValue) {
return ((SkylarkValue) o).isImmutable();
}
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java
index 890d16c46e..debe96856f 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java
@@ -396,11 +396,6 @@ public abstract class SkylarkList<E> extends MutableCollection<E> implements Lis
return false;
}
- @Override
- public boolean isImmutable() {
- return false;
- }
-
/**
* An empty IMMUTABLE MutableList.
*/