aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java6
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java2
-rw-r--r--src/main/java/com/google/devtools/build/lib/syntax/SkylarkNestedSet.java4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java
index 9ace1d304e..1eedae3fc1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java
@@ -205,7 +205,7 @@ final class BundleSupport {
.addOutput(zipOutput)
.addInput(storyboardInput)
// TODO(dmaclach): Adding realpath here should not be required once
- // https://github.com/google/bazel/issues/285 is fixed.
+ // https://github.com/bazelbuild/bazel/issues/285 is fixed.
.addInput(attributes.realpath())
.build(ruleContext));
}
@@ -274,7 +274,7 @@ final class BundleSupport {
.addOutput(zipOutput)
.addInput(original)
// TODO(dmaclach): Adding realpath here should not be required once
- // https://github.com/google/bazel/issues/285 is fixed.
+ // https://github.com/bazelbuild/bazel/issues/285 is fixed.
.addInput(attributes.realpath())
.build(ruleContext));
}
@@ -445,7 +445,7 @@ final class BundleSupport {
/**
* Returns the location of the realpath tool.
- * TODO(dmaclach): Should not be required once https://github.com/google/bazel/issues/285
+ * TODO(dmaclach): Should not be required once https://github.com/bazelbuild/bazel/issues/285
* is fixed.
*/
Artifact realpath() {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
index 60e4d2956e..589b37f43b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
@@ -481,7 +481,7 @@ public class ObjcRuleClasses {
.add(attr("$ibtoolwrapper", LABEL).cfg(HOST).exec()
.value(env.getLabel("//tools/objc:ibtoolwrapper")))
// TODO(dmaclach): Adding realpath here should not be required once
- // https://github.com/google/bazel/issues/285 is fixed.
+ // https://github.com/bazelbuild/bazel/issues/285 is fixed.
.add(attr("$realpath", LABEL).cfg(HOST).exec()
.value(env.getLabel("//tools/objc:realpath")))
.add(attr("$swiftstdlibtoolzip_deploy", LABEL).cfg(HOST)
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 0fba9ee056..4370eceb5c 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
@@ -59,13 +59,13 @@ import javax.annotation.Nullable;
+ "<code>{1, 2, 3, {4, 5}}</code> leads to <code>1 2 3 4 5</code>. "
+ "This ordering enforces that elements of the set always come before elements of "
+ "nested sets (parent-first), which may lead to situations where left-to-right "
- + "order cannot be preserved (<a href=\"https://github.com/google/bazel/blob/master/src/main/java/com/google/devtools/build/lib/collect/nestedset/LinkOrderExpander.java#L56\">Example</a>)."
+ + "order cannot be preserved (<a href=\"https://github.com/bazelbuild/bazel/blob/master/src/main/java/com/google/devtools/build/lib/collect/nestedset/LinkOrderExpander.java#L56\">Example</a>)."
+ "</li>"
+ "<li><code>naive_link</code>: Defines \"naive\" left-to-right pre-ordering "
+ "(parent-first), i.e. <code>{1, 2, 3, {4, 5}}</code> leads to <code>1 2 3 4 5</code>. "
+ "Unlike <code>link</code> ordering, it will sacrifice the parent-first property in "
+ "order to uphold left-to-right order in cases where both properties cannot be "
- + "guaranteed (<a href=\"https://github.com/google/bazel/blob/master/src/main/java/com/google/devtools/build/lib/collect/nestedset/NaiveLinkOrderExpander.java#L26\">Example</a>)."
+ + "guaranteed (<a href=\"https://github.com/bazelbuild/bazel/blob/master/src/main/java/com/google/devtools/build/lib/collect/nestedset/NaiveLinkOrderExpander.java#L26\">Example</a>)."
+ "</li></ul>"
+ "Except for <code>stable</code>, the above values are incompatible with each other. "
+ "Consequently, two sets can only be merged via the <code>+</code> operator or via "