From bc4a0a2393768457f95ac0a54bfc641fede6032a Mon Sep 17 00:00:00 2001 From: vladmos Date: Thu, 22 Mar 2018 06:05:45 -0700 Subject: Remove the --incompatible_disallow_uncalled_set_constructor flag RELNOTES[INC]: The --incompatible_disallow_uncalled_set_constructor flag is no longer available, the `set` constructor` is completely removed from Skylark. Use `depset` instead. PiperOrigin-RevId: 190053331 --- .../build/lib/packages/SkylarkSemanticsCodec.java | 2 -- .../lib/packages/SkylarkSemanticsOptions.java | 12 ---------- .../devtools/build/lib/syntax/Identifier.java | 7 ------ .../build/lib/syntax/SkylarkSemantics.java | 10 -------- .../build/lib/syntax/ValidationEnvironment.java | 6 ----- .../packages/SkylarkSemanticsConsistencyTest.java | 2 -- .../build/lib/syntax/SkylarkNestedSetTest.java | 27 ---------------------- 7 files changed, 66 deletions(-) (limited to 'src') diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java index ab6e6ed79d..9056342bac 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java +++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java @@ -51,7 +51,6 @@ public final class SkylarkSemanticsCodec implements ObjectCodec public abstract boolean incompatibleBzlDisallowLoadAfterStatement(); public abstract boolean incompatibleDepsetIsNotIterable(); - public abstract boolean incompatibleDepsetUnion(); - public abstract boolean incompatibleDisableGlobTracking(); public abstract boolean incompatibleDisableObjcProviderResources(); - public abstract boolean incompatibleDisallowDictPlus(); public abstract boolean incompatibleDisallowThreeArgVardef(); public abstract boolean incompatibleDisallowToplevelIfStatement(); - public abstract boolean incompatibleDisallowUncalledSetConstructor(); - public abstract boolean incompatibleNewActionsApi(); - public abstract boolean incompatibleRemoveNativeGitRepository(); - public abstract boolean incompatibleRemoveNativeHttpArchive(); - public abstract boolean incompatibleStringIsNotIterable(); public abstract boolean internalSkylarkFlagTestCanary(); @@ -84,7 +76,6 @@ public abstract class SkylarkSemantics { .incompatibleDisallowDictPlus(false) .incompatibleDisallowThreeArgVardef(false) .incompatibleDisallowToplevelIfStatement(true) - .incompatibleDisallowUncalledSetConstructor(true) .incompatibleNewActionsApi(false) .incompatibleRemoveNativeGitRepository(false) .incompatibleRemoveNativeHttpArchive(false) @@ -105,7 +96,6 @@ public abstract class SkylarkSemantics { public abstract Builder incompatibleDisallowDictPlus(boolean value); public abstract Builder incompatibleDisallowThreeArgVardef(boolean value); public abstract Builder incompatibleDisallowToplevelIfStatement(boolean value); - public abstract Builder incompatibleDisallowUncalledSetConstructor(boolean value); public abstract Builder incompatibleNewActionsApi(boolean value); public abstract Builder incompatibleRemoveNativeGitRepository(boolean value); public abstract Builder incompatibleRemoveNativeHttpArchive(boolean value); diff --git a/src/main/java/com/google/devtools/build/lib/syntax/ValidationEnvironment.java b/src/main/java/com/google/devtools/build/lib/syntax/ValidationEnvironment.java index f7aba2c568..1c68edc1ae 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/ValidationEnvironment.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/ValidationEnvironment.java @@ -68,12 +68,6 @@ public final class ValidationEnvironment extends SyntaxTreeVisitor { block.variables.addAll(builtinVariables); block.readOnlyVariables.addAll(builtinVariables); semantics = env.getSemantics(); - - // If the flag is set to false, it should be allowed to have `set` - // in non-executable parts of the code. - if (!env.getSemantics().incompatibleDisallowUncalledSetConstructor()) { - block.variables.add("set"); - } } @Override diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java index 7cde32faca..a9a3d517f7 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java @@ -127,7 +127,6 @@ public class SkylarkSemanticsConsistencyTest { "--incompatible_disallow_dict_plus=" + rand.nextBoolean(), "--incompatible_disallow_three_arg_vardef=" + rand.nextBoolean(), "--incompatible_disallow_toplevel_if_statement=" + rand.nextBoolean(), - "--incompatible_disallow_uncalled_set_constructor=" + rand.nextBoolean(), "--incompatible_new_actions_api=" + rand.nextBoolean(), "--incompatible_remove_native_git_repository=" + rand.nextBoolean(), "--incompatible_remove_native_http_archive=" + rand.nextBoolean(), @@ -150,7 +149,6 @@ public class SkylarkSemanticsConsistencyTest { .incompatibleDisallowDictPlus(rand.nextBoolean()) .incompatibleDisallowThreeArgVardef(rand.nextBoolean()) .incompatibleDisallowToplevelIfStatement(rand.nextBoolean()) - .incompatibleDisallowUncalledSetConstructor(rand.nextBoolean()) .incompatibleNewActionsApi(rand.nextBoolean()) .incompatibleRemoveNativeGitRepository(rand.nextBoolean()) .incompatibleRemoveNativeHttpArchive(rand.nextBoolean()) diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkNestedSetTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkNestedSetTest.java index 307f416fe0..0836d0ed38 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkNestedSetTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkNestedSetTest.java @@ -35,33 +35,6 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class SkylarkNestedSetTest extends EvaluationTestCase { - @Test - public void testLegacyConstructorNotCalled() throws Exception { - env = - newEnvironmentWithSkylarkOptions("--incompatible_disallow_uncalled_set_constructor=false"); - eval("s = set([1, 2]) if False else depset([3, 4])"); - SkylarkNestedSet s = get("s"); - assertThat(s.getSet(Object.class)).containsExactly(3, 4); - - // Static check are only enabled in .bzl files - new SkylarkTest("--incompatible_disallow_uncalled_set_constructor=true") - .testIfErrorContains("The function 'set' has been removed in favor of 'depset'", - "s = set([1, 2]) if False else depset([3, 4])"); - new BuildTest("--incompatible_disallow_uncalled_set_constructor=true") - .testEval("s = set([1, 2]) if False else depset([3, 4]); s.to_list()", "[3, 4]"); - } - - @Test - public void testLegacyConstructorCalled() throws Exception { - new BothModesTest("--incompatible_disallow_uncalled_set_constructor=false") - .testIfErrorContains("The function 'set' has been removed in favor of 'depset'", - "s = set([1, 2])"); - - new BothModesTest("--incompatible_disallow_uncalled_set_constructor=true") - .testIfErrorContains("The function 'set' has been removed in favor of 'depset'", - "s = set([1, 2])"); - } - @Test public void testConstructor() throws Exception { eval("s = depset(order='default')"); -- cgit v1.2.3