bazel syntax: rename Runtime.NONE to Starlark.NONE and delete Runtime
...and move Runtime.NoneType to top level.
This is a breaking change to copybara.
BEGIN_PUBLIC
bazel syntax: rename Runtime.NONE to Starlark.NONE
END_PUBLIC
PiperOrigin-RevId: 280001048
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
index 89201b3..30c6b62 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
@@ -44,7 +44,7 @@
import com.google.devtools.build.lib.syntax.ClassObject;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.EvalUtils;
-import com.google.devtools.build.lib.syntax.Runtime;
+import com.google.devtools.build.lib.syntax.Starlark;
import com.google.devtools.build.lib.util.FileType;
import com.google.devtools.build.lib.util.FileTypeSet;
import com.google.devtools.build.lib.util.StringUtil;
@@ -1493,7 +1493,7 @@
attrValues, "No such regular (non computed) attribute '%s'.");
Object result = callback.call(eventHandler, attrs);
try {
- return type.cast((result == Runtime.NONE) ? type.getDefaultValue() : result);
+ return type.cast((result == Starlark.NONE) ? type.getDefaultValue() : result);
} catch (ClassCastException ex) {
throw new EvalException(
location,
diff --git a/src/main/java/com/google/devtools/build/lib/packages/BuildType.java b/src/main/java/com/google/devtools/build/lib/packages/BuildType.java
index d272543..4d68711 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/BuildType.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/BuildType.java
@@ -11,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-
package com.google.devtools.build.lib.packages;
import com.google.common.annotations.VisibleForTesting;
@@ -35,8 +34,8 @@
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.Printer;
import com.google.devtools.build.lib.syntax.Printer.BasePrinter;
-import com.google.devtools.build.lib.syntax.Runtime;
import com.google.devtools.build.lib.syntax.SelectorValue;
+import com.google.devtools.build.lib.syntax.Starlark;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
@@ -624,7 +623,7 @@
if (key.equals(DEFAULT_CONDITION_LABEL)) {
foundDefaultCondition = true;
}
- if (entry.getValue() == Runtime.NONE) {
+ if (entry.getValue() == Starlark.NONE) {
// { "//condition": None } is the same as not setting the value.
result.put(key, originalType.getDefaultValue());
defaultValuesBuilder.add(key);
diff --git a/src/main/java/com/google/devtools/build/lib/packages/ImplicitOutputsFunction.java b/src/main/java/com/google/devtools/build/lib/packages/ImplicitOutputsFunction.java
index 86c92ac..fa90b26 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/ImplicitOutputsFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/ImplicitOutputsFunction.java
@@ -33,7 +33,7 @@
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization;
import com.google.devtools.build.lib.syntax.ClassObject;
import com.google.devtools.build.lib.syntax.EvalException;
-import com.google.devtools.build.lib.syntax.Runtime;
+import com.google.devtools.build.lib.syntax.Starlark;
import com.google.devtools.build.lib.util.StringUtil;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
import com.google.devtools.build.lib.vfs.PathFragment;
@@ -99,7 +99,7 @@
// since we don't yet have a build configuration.
if (!map.isConfigurable(attrName)) {
Object value = map.get(attrName, attrType);
- attrValues.put(attrName, value == null ? Runtime.NONE : value);
+ attrValues.put(attrName, value == null ? Starlark.NONE : value);
}
}
ClassObject attrs =
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
index 6d65a73..4b8a349 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -55,8 +55,8 @@
import com.google.devtools.build.lib.syntax.Mutability;
import com.google.devtools.build.lib.syntax.Node;
import com.google.devtools.build.lib.syntax.NodeVisitor;
+import com.google.devtools.build.lib.syntax.NoneType;
import com.google.devtools.build.lib.syntax.ParserInput;
-import com.google.devtools.build.lib.syntax.Runtime;
import com.google.devtools.build.lib.syntax.SkylarkUtils;
import com.google.devtools.build.lib.syntax.SkylarkUtils.Phase;
import com.google.devtools.build.lib.syntax.Starlark;
@@ -539,7 +539,7 @@
loc, "at least one argument must be given to the 'package' function");
}
- return Runtime.NONE;
+ return Starlark.NONE;
}
};
}
@@ -591,7 +591,7 @@
}
@SuppressWarnings("unused")
- public Runtime.NoneType invoke(Map<String, Object> kwargs, Location loc, StarlarkThread thread)
+ public NoneType invoke(Map<String, Object> kwargs, Location loc, StarlarkThread thread)
throws EvalException, InterruptedException {
SkylarkUtils.checkLoadingOrWorkspacePhase(thread, ruleClassName, loc);
try {
@@ -599,7 +599,7 @@
} catch (RuleFactory.InvalidRuleException | Package.NameConflictException e) {
throw new EvalException(loc, e.getMessage());
}
- return Runtime.NONE;
+ return Starlark.NONE;
}
private void addRule(
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index af803b0..6e2197d 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -57,8 +57,8 @@
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization;
import com.google.devtools.build.lib.syntax.BaseFunction;
import com.google.devtools.build.lib.syntax.EvalException;
-import com.google.devtools.build.lib.syntax.Runtime;
import com.google.devtools.build.lib.syntax.SkylarkList;
+import com.google.devtools.build.lib.syntax.Starlark;
import com.google.devtools.build.lib.util.FileTypeSet;
import com.google.devtools.build.lib.util.StringUtil;
import com.google.devtools.build.lib.vfs.PathFragment;
@@ -1880,7 +1880,7 @@
* attributeValues} map.
*
* <p>Handles the special cases of the attribute named {@code "name"} and attributes with value
- * {@link Runtime#NONE}.
+ * {@link Starlark#NONE}.
*
* <p>Returns a bitset {@code b} where {@code b.get(i)} is {@code true} if this method set a value
* for the attribute with index {@code i} in this {@link RuleClass}. Errors are reported on {@code
@@ -1897,7 +1897,7 @@
String attributeName = attributeValues.getName(attributeAccessor);
Object attributeValue = attributeValues.getValue(attributeAccessor);
// Ignore all None values.
- if (attributeValue == Runtime.NONE) {
+ if (attributeValue == Starlark.NONE) {
continue;
}
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java
index df4030b..3687650 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java
@@ -36,7 +36,7 @@
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.EvalUtils;
import com.google.devtools.build.lib.syntax.Mutability;
-import com.google.devtools.build.lib.syntax.Runtime;
+import com.google.devtools.build.lib.syntax.NoneType;
import com.google.devtools.build.lib.syntax.SkylarkDict;
import com.google.devtools.build.lib.syntax.SkylarkList;
import com.google.devtools.build.lib.syntax.SkylarkList.MutableList;
@@ -131,7 +131,7 @@
PackageContext context = getContext(thread, loc);
Target target = context.pkgBuilder.getTarget(name);
SkylarkDict<String, Object> rule = targetDict(target, loc, thread.mutability());
- return rule != null ? rule : Runtime.NONE;
+ return rule != null ? rule : Starlark.NONE;
}
/*
@@ -158,7 +158,7 @@
}
@Override
- public Runtime.NoneType packageGroup(
+ public NoneType packageGroup(
String name,
SkylarkList<?> packagesO,
SkylarkList<?> includesO,
@@ -176,7 +176,7 @@
try {
context.pkgBuilder.addPackageGroup(name, packages, includes, context.eventHandler, loc);
- return Runtime.NONE;
+ return Starlark.NONE;
} catch (LabelSyntaxException e) {
throw new EvalException(
loc, "package group has invalid name: " + name + ": " + e.getMessage());
@@ -186,7 +186,7 @@
}
@Override
- public Runtime.NoneType exportsFiles(
+ public NoneType exportsFiles(
SkylarkList<?> srcs,
Object visibilityO,
Object licensesO,
@@ -262,7 +262,7 @@
throw new EvalException(loc, e.getMessage());
}
}
- return Runtime.NONE;
+ return Starlark.NONE;
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkBuildLibrary.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkBuildLibrary.java
index 74a1562..6e89c94 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkBuildLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkBuildLibrary.java
@@ -27,7 +27,7 @@
import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
import com.google.devtools.build.lib.skylarkinterface.SkylarkGlobalLibrary;
import com.google.devtools.build.lib.syntax.EvalException;
-import com.google.devtools.build.lib.syntax.Runtime;
+import com.google.devtools.build.lib.syntax.NoneType;
import com.google.devtools.build.lib.syntax.SkylarkList;
import com.google.devtools.build.lib.syntax.Starlark;
import com.google.devtools.build.lib.syntax.StarlarkThread;
@@ -87,7 +87,7 @@
documented = false,
useLocation = true,
useStarlarkThread = true)
- public Runtime.NoneType environmentGroup(
+ public NoneType environmentGroup(
String name,
SkylarkList<?> environmentsList, // <Label>
SkylarkList<?> defaultsList, // <Label>
@@ -111,7 +111,7 @@
try {
context.pkgBuilder.addEnvironmentGroup(
name, environments, defaults, context.eventHandler, loc);
- return Runtime.NONE;
+ return Starlark.NONE;
} catch (LabelSyntaxException e) {
throw new EvalException(
loc, "environment group has invalid name: " + name + ": " + e.getMessage());
@@ -135,7 +135,7 @@
documented = false,
useStarlarkThread = true,
useLocation = true)
- public Runtime.NoneType invoke(
+ public NoneType invoke(
SkylarkList<?> licensesList, // list of license strings
Location loc,
StarlarkThread thread)
@@ -148,7 +148,7 @@
context.eventHandler.handle(Event.error(loc, e.getMessage()));
context.pkgBuilder.setContainsErrors();
}
- return Runtime.NONE;
+ return Starlark.NONE;
}
@SkylarkCallable(
@@ -162,7 +162,7 @@
documented = false,
useStarlarkThread = true,
useLocation = true)
- public Runtime.NoneType distribs(Object object, Location loc, StarlarkThread thread)
+ public NoneType distribs(Object object, Location loc, StarlarkThread thread)
throws EvalException {
PackageContext context = getContext(thread, loc);
@@ -174,6 +174,6 @@
context.eventHandler.handle(Event.error(loc, e.getMessage()));
context.pkgBuilder.setContainsErrors();
}
- return Runtime.NONE;
+ return Starlark.NONE;
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java b/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java
index ab9f88c..b061b53 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java
@@ -27,10 +27,10 @@
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.EvalUtils;
import com.google.devtools.build.lib.syntax.Printer;
-import com.google.devtools.build.lib.syntax.Runtime;
import com.google.devtools.build.lib.syntax.SkylarkDict;
import com.google.devtools.build.lib.syntax.SkylarkList;
import com.google.devtools.build.lib.syntax.SkylarkType;
+import com.google.devtools.build.lib.syntax.Starlark;
import com.google.devtools.build.lib.syntax.StarlarkThread;
import com.google.protobuf.TextFormat;
import java.io.Serializable;
@@ -287,7 +287,7 @@
private void printJson(Object value, StringBuilder sb, Location loc, String container, String key)
throws EvalException {
- if (value == Runtime.NONE) {
+ if (value == Starlark.NONE) {
sb.append("null");
} else if (value instanceof ClassObject) {
sb.append("{");
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
index 9e4f0a2..03dcfc3 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.lib.packages;
-import static com.google.devtools.build.lib.syntax.Runtime.NONE;
+import static com.google.devtools.build.lib.syntax.Starlark.NONE;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java
index ab44235..36b12c6 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.lib.packages;
-import static com.google.devtools.build.lib.syntax.Runtime.NONE;
+import static com.google.devtools.build.lib.syntax.Starlark.NONE;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -30,7 +30,7 @@
import com.google.devtools.build.lib.packages.RuleFactory.InvalidRuleException;
import com.google.devtools.build.lib.skylarkbuildapi.WorkspaceGlobalsApi;
import com.google.devtools.build.lib.syntax.EvalException;
-import com.google.devtools.build.lib.syntax.Runtime.NoneType;
+import com.google.devtools.build.lib.syntax.NoneType;
import com.google.devtools.build.lib.syntax.SkylarkDict;
import com.google.devtools.build.lib.syntax.SkylarkList;
import com.google.devtools.build.lib.syntax.StarlarkThread;
