Change depset conversion to strings

RELNOTES[INC]:
Depsets (former sets) are converted to strings as "depset(...)" instead of
"set(...)".

--
PiperOrigin-RevId: 145990995
MOS_MIGRATED_REVID=145990995

2 files changed, 3 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BazelLibrary.java b/src/main/java/com/google/devtools/build/lib/syntax/BazelLibrary.java
index 284483616f..c55e607003 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/BazelLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/BazelLibrary.java
@@ -48,12 +48,7 @@ public class BazelLibrary {
       new BuiltinFunction("type") {
         public String invoke(Object object) {
           // There is no 'type' type in Skylark, so we return a string with the type name.
-          String name = EvalUtils.getDataTypeName(object, false);
-          // TODO(bazel-team): Temporary change to avoid breaking existing code.
-          if (name.equals("depset")) {
-            return "set";
-          }
-          return name;
+          return EvalUtils.getDataTypeName(object, false);
         }
       };
 
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkNestedSet.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkNestedSet.java
index 3edfb99b31..5b42cd70b9 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkNestedSet.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkNestedSet.java
@@ -190,7 +190,7 @@ public final class SkylarkNestedSet implements SkylarkValue, SkylarkQueryable {
   SkylarkNestedSet(SkylarkType contentType, NestedSet<?> set) {
     // This is here for the sake of FuncallExpression.
     this.contentType = Preconditions.checkNotNull(contentType, "type cannot be null");
-    this.set = Preconditions.checkNotNull(set, "set cannot be null");
+    this.set = Preconditions.checkNotNull(set, "depset cannot be null");
     this.items = null;
     this.transitiveItems = null;
   }
@@ -333,7 +333,7 @@ public final class SkylarkNestedSet implements SkylarkValue, SkylarkQueryable {
 
   @Override
   public void write(Appendable buffer, char quotationMark) {
-    Printer.append(buffer, "set(");
+    Printer.append(buffer, "depset(");
     Printer.printList(buffer, set, "[", ", ", "]", null, quotationMark);
     Order order = getOrder();
     if (order != Order.STABLE_ORDER) {