aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/syntax
diff options
context:
space:
mode:
authorGravatar Kristina Chodorow <kchodorow@google.com>2015-09-01 09:15:54 +0000
committerGravatar Lukacs Berki <lberki@google.com>2015-09-01 10:44:24 +0000
commit2b1763a46bc1eb67cde389525d86e7f678e7a704 (patch)
tree7f62654cd2f3b045bb5d05cfffccda2d253b5879 /src/main/java/com/google/devtools/build/lib/syntax
parentba4a85441bf08b44975ad410988efb69572fb61c (diff)
Change URLs to bazelbuild
-- MOS_MIGRATED_REVID=102022958
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/syntax')
-rw-r--r--src/main/java/com/google/devtools/build/lib/syntax/SkylarkNestedSet.java4
1 files changed, 2 insertions, 2 deletions
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 "