commit d21a0d194b3e83ca585e466ed4f6a383776bfb76
author Googler <noreply@google.com> Thu Nov 21 13:52:30 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Nov 21 13:53:35 2019 -0800
tree 2b82c52befeb766677e7c3c0a0bb7a95f05b7404
parent bbde22993476d5265baadba022be35852c5101d7

bazel syntax: rename SkylarkNestedSet to Depset

The new name matches the Bazel documentation, whereas
NestedSet is a Blaze internal. Also, it is shorter.

Also: tweak its class doc comment.
All other changes are mechanical.
PiperOrigin-RevId: 281824680

src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java
index 79e0749..9ed513c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java
@@ -19,8 +19,8 @@
 import com.google.devtools.build.lib.packages.BuiltinProvider;
 import com.google.devtools.build.lib.packages.NativeInfo;
 import com.google.devtools.build.lib.skylarkbuildapi.DefaultInfoApi;
+import com.google.devtools.build.lib.syntax.Depset;
 import com.google.devtools.build.lib.syntax.EvalException;
-import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
 import com.google.devtools.build.lib.syntax.Starlark;
 import javax.annotation.Nullable;
 
@@ -28,7 +28,7 @@
 @Immutable
 public final class DefaultInfo extends NativeInfo implements DefaultInfoApi {
 
-  private final SkylarkNestedSet files;
+  private final Depset files;
   private final Runfiles runfiles;
   private final Runfiles dataRunfiles;
   private final Runfiles defaultRunfiles;
@@ -46,19 +46,21 @@
       FilesToRunProvider filesToRunProvider) {
     this(
         Location.BUILTIN,
-        SkylarkNestedSet.of(Artifact.class, fileProvider.getFilesToBuild()),
+        Depset.of(Artifact.class, fileProvider.getFilesToBuild()),
         Runfiles.EMPTY,
         (runfilesProvider == null) ? Runfiles.EMPTY : runfilesProvider.getDataRunfiles(),
         (runfilesProvider == null) ? Runfiles.EMPTY : runfilesProvider.getDefaultRunfiles(),
         filesToRunProvider.getExecutable(),
-        filesToRunProvider
-    );
+        filesToRunProvider);
   }
 
   private DefaultInfo(
       Location loc,
-      SkylarkNestedSet files, Runfiles runfiles,
-      Runfiles dataRunfiles, Runfiles defaultRunfiles, Artifact executable,
+      Depset files,
+      Runfiles runfiles,
+      Runfiles dataRunfiles,
+      Runfiles defaultRunfiles,
+      Artifact executable,
       @Nullable FilesToRunProvider filesToRunProvider) {
     super(PROVIDER, loc);
     this.files = files;
@@ -77,7 +79,7 @@
   }
 
   @Override
-  public SkylarkNestedSet getFiles() {
+  public Depset getFiles() {
     return files;
   }
 
@@ -144,11 +146,12 @@
 
       return new DefaultInfo(
           loc,
-          castNoneToNull(SkylarkNestedSet.class, files),
+          castNoneToNull(Depset.class, files),
           statelessRunfiles,
           dataRunfiles,
           defaultRunfiles,
-          castNoneToNull(Artifact.class, executable), null);
+          castNoneToNull(Artifact.class, executable),
+          null);
     }
   }