The great Skylark -> Starlark class migration:
skylark.common package
PiperOrigin-RevId: 317103543
diff --git a/src/BUILD b/src/BUILD
index 0cb189a..b5756a1 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -473,7 +473,7 @@
"//src/tools/execlog:srcs",
"//src/tools/workspacelog:srcs",
"//src/tools/launcher:srcs",
- "//src/tools/skylark/java/com/google/devtools/skylark/common:srcs",
+ "//src/tools/starlark/java/com/google/devtools/starlark/common:srcs",
"//src/tools/xcode/realpath:srcs",
"//src/tools/singlejar:srcs",
"//src/tools/xcode/stdredirect:srcs",
diff --git a/src/main/java/com/google/devtools/build/skydoc/BUILD b/src/main/java/com/google/devtools/build/skydoc/BUILD
index 2cdae0b..1e87623 100644
--- a/src/main/java/com/google/devtools/build/skydoc/BUILD
+++ b/src/main/java/com/google/devtools/build/skydoc/BUILD
@@ -90,7 +90,7 @@
"//src/main/java/com/google/devtools/build/skydoc/rendering",
"//src/main/java/com/google/devtools/build/skydoc/rendering/proto:stardoc_output_java_proto",
"//src/main/java/com/google/devtools/common/options",
- "//src/tools/skylark/java/com/google/devtools/skylark/common",
+ "//src/tools/starlark/java/com/google/devtools/starlark/common",
"//third_party:guava",
],
)
diff --git a/src/main/java/com/google/devtools/build/skydoc/rendering/BUILD b/src/main/java/com/google/devtools/build/skydoc/rendering/BUILD
index f84d98a..0da7b88 100644
--- a/src/main/java/com/google/devtools/build/skydoc/rendering/BUILD
+++ b/src/main/java/com/google/devtools/build/skydoc/rendering/BUILD
@@ -19,7 +19,7 @@
"//src/main/java/com/google/devtools/build/lib:syntax",
"//src/main/java/com/google/devtools/build/lib/events",
"//src/main/java/com/google/devtools/build/skydoc/rendering/proto:stardoc_output_java_proto",
- "//src/tools/skylark/java/com/google/devtools/skylark/common",
+ "//src/tools/starlark/java/com/google/devtools/starlark/common",
"//third_party:apache_velocity",
"//third_party:guava",
"//third_party:jsr305",
diff --git a/src/main/java/com/google/devtools/build/skydoc/rendering/DocstringParseException.java b/src/main/java/com/google/devtools/build/skydoc/rendering/DocstringParseException.java
index 37e27c8..2e78dc7 100644
--- a/src/main/java/com/google/devtools/build/skydoc/rendering/DocstringParseException.java
+++ b/src/main/java/com/google/devtools/build/skydoc/rendering/DocstringParseException.java
@@ -16,7 +16,7 @@
import com.google.devtools.build.lib.syntax.Location;
import com.google.devtools.build.skydoc.rendering.proto.StardocOutputProtos.StarlarkFunctionInfo;
-import com.google.devtools.skylark.common.DocstringUtils.DocstringParseError;
+import com.google.devtools.starlark.common.DocstringUtils.DocstringParseError;
import java.util.List;
/**
diff --git a/src/main/java/com/google/devtools/build/skydoc/rendering/FunctionUtil.java b/src/main/java/com/google/devtools/build/skydoc/rendering/FunctionUtil.java
index 1ba67e5..98aec8a 100644
--- a/src/main/java/com/google/devtools/build/skydoc/rendering/FunctionUtil.java
+++ b/src/main/java/com/google/devtools/build/skydoc/rendering/FunctionUtil.java
@@ -22,10 +22,10 @@
import com.google.devtools.build.lib.syntax.StarlarkFunction;
import com.google.devtools.build.skydoc.rendering.proto.StardocOutputProtos.FunctionParamInfo;
import com.google.devtools.build.skydoc.rendering.proto.StardocOutputProtos.StarlarkFunctionInfo;
-import com.google.devtools.skylark.common.DocstringUtils;
-import com.google.devtools.skylark.common.DocstringUtils.DocstringInfo;
-import com.google.devtools.skylark.common.DocstringUtils.DocstringParseError;
-import com.google.devtools.skylark.common.DocstringUtils.ParameterDoc;
+import com.google.devtools.starlark.common.DocstringUtils;
+import com.google.devtools.starlark.common.DocstringUtils.DocstringInfo;
+import com.google.devtools.starlark.common.DocstringUtils.DocstringParseError;
+import com.google.devtools.starlark.common.DocstringUtils.ParameterDoc;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
diff --git a/src/tools/skylark/java/com/google/devtools/skylark/common/BUILD b/src/tools/starlark/java/com/google/devtools/starlark/common/BUILD
similarity index 100%
rename from src/tools/skylark/java/com/google/devtools/skylark/common/BUILD
rename to src/tools/starlark/java/com/google/devtools/starlark/common/BUILD
diff --git a/src/tools/skylark/java/com/google/devtools/skylark/common/DocstringUtils.java b/src/tools/starlark/java/com/google/devtools/starlark/common/DocstringUtils.java
similarity index 99%
rename from src/tools/skylark/java/com/google/devtools/skylark/common/DocstringUtils.java
rename to src/tools/starlark/java/com/google/devtools/starlark/common/DocstringUtils.java
index f57dabb..4e8ba7a 100644
--- a/src/tools/skylark/java/com/google/devtools/skylark/common/DocstringUtils.java
+++ b/src/tools/starlark/java/com/google/devtools/starlark/common/DocstringUtils.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.skylark.common;
+package com.google.devtools.starlark.common;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
-import com.google.devtools.skylark.common.LocationRange.Location;
+import com.google.devtools.starlark.common.LocationRange.Location;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
diff --git a/src/tools/skylark/java/com/google/devtools/skylark/common/LocationRange.java b/src/tools/starlark/java/com/google/devtools/starlark/common/LocationRange.java
similarity index 97%
rename from src/tools/skylark/java/com/google/devtools/skylark/common/LocationRange.java
rename to src/tools/starlark/java/com/google/devtools/starlark/common/LocationRange.java
index e541416..68a315d 100644
--- a/src/tools/skylark/java/com/google/devtools/skylark/common/LocationRange.java
+++ b/src/tools/starlark/java/com/google/devtools/starlark/common/LocationRange.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.skylark.common;
+package com.google.devtools.starlark.common;
import com.google.common.base.Preconditions;