commit bc74d1d5d68a569ccab39d1aabed82b3321bf3c6
author adonovan <adonovan@google.com> Thu Apr 30 12:08:31 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Apr 30 12:09:24 2020 -0700
tree d3b81e5f44900ebe53166d8e5d36fc1937036069
parent 556096a18a35e3e3e4f1390fd68f26a6176c21f7

bazel syntax: eject Depset from the Starlark interpreter

Depset, the Starlark wrapper, now lives alongside NestedSet,
the wrapped data type.

The interpreter still catches NestedSetException,
but now using a string hack since it cannot name the type.

Also:
- Label.TYPE (a Depset.ElementType) inlined to its sole
  use in Pinto, to avoid cmdline->nestedset dependency.
- depset tests moved from syntax.MethodLibrary to DepsetTest.
PiperOrigin-RevId: 309273148

src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkRuleContextApi.java

diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkRuleContextApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkRuleContextApi.java
index 8a6dbf6..3e192d4 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkRuleContextApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkRuleContextApi.java
@@ -16,6 +16,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.cmdline.Label;
+import com.google.devtools.build.lib.collect.nestedset.Depset;
 import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi;
 import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi;
 import com.google.devtools.build.lib.skylarkbuildapi.core.TransitiveInfoCollectionApi;
@@ -28,7 +29,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.syntax.ClassObject;
-import com.google.devtools.build.lib.syntax.Depset;
 import com.google.devtools.build.lib.syntax.Dict;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.NoneType;