File tree 3 files changed +5
-13
lines changed
main/java/com/google/devtools/build/lib/packages/semantics
test/java/com/google/devtools/build
3 files changed +5
-13
lines changed Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ public final class BuildLanguageOptions extends OptionsBase {
70
70
71
71
@ Option (
72
72
name = "incompatible_remove_rule_name_parameter" ,
73
- defaultValue = "true " ,
73
+ defaultValue = "false " ,
74
74
documentationCategory = OptionDocumentationCategory .UNCATEGORIZED ,
75
75
effectTags = {OptionEffectTag .LOADING_AND_ANALYSIS },
76
76
metadataTags = {OptionMetadataTag .INCOMPATIBLE_CHANGE },
@@ -724,7 +724,7 @@ public StarlarkSemantics toStarlarkSemantics() {
724
724
public static final String INCOMPATIBLE_STOP_EXPORTING_LANGUAGE_MODULES =
725
725
"-incompatible_stop_exporting_language_modules" ;
726
726
public static final String INCOMPATIBLE_REMOVE_RULE_NAME_PARAMETER =
727
- "+ incompatible_remove_rule_name_parameter" ;
727
+ "- incompatible_remove_rule_name_parameter" ;
728
728
public static final String INCOMPATIBLE_DISALLOW_SYMLINK_FILE_TO_DIR =
729
729
"+incompatible_disallow_symlink_file_to_dir" ;
730
730
public static final String EXPERIMENTAL_ALLOW_TAGS_PROPAGATION =
Original file line number Diff line number Diff line change @@ -947,7 +947,6 @@ public void testExportAliasedName() throws Exception {
947
947
948
948
@ Test
949
949
public void testExportWithSpecifiedName () throws Exception {
950
- setBuildLanguageOptions ("--noincompatible_remove_rule_name_parameter" );
951
950
evalAndExport (
952
951
ev , //
953
952
"def _impl(ctx): pass" ,
@@ -962,7 +961,6 @@ public void testExportWithSpecifiedName() throws Exception {
962
961
963
962
@ Test
964
963
public void testExportWithSpecifiedNameFailure () throws Exception {
965
- setBuildLanguageOptions ("--noincompatible_remove_rule_name_parameter" );
966
964
ev .setFailFast (false );
967
965
968
966
evalAndExport (
@@ -975,7 +973,6 @@ public void testExportWithSpecifiedNameFailure() throws Exception {
975
973
976
974
@ Test
977
975
public void testExportWithNonStringNameFailsCleanly () throws Exception {
978
- setBuildLanguageOptions ("--noincompatible_remove_rule_name_parameter" );
979
976
ev .setFailFast (false );
980
977
981
978
evalAndExport (
@@ -988,7 +985,6 @@ public void testExportWithNonStringNameFailsCleanly() throws Exception {
988
985
989
986
@ Test
990
987
public void testExportWithMultipleErrors () throws Exception {
991
- setBuildLanguageOptions ("--noincompatible_remove_rule_name_parameter" );
992
988
ev .setFailFast (false );
993
989
994
990
evalAndExport (
Original file line number Diff line number Diff line change 22
22
import com .google .common .collect .ImmutableMap ;
23
23
import com .google .common .collect .ImmutableSet ;
24
24
import com .google .common .collect .Iterables ;
25
- import com .google .devtools .build .lib .analysis .util .BuildViewTestCase ;
25
+ import com .google .devtools .build .lib .analysis .util .BuildViewTestCase ; // a bad dependency!
26
26
import com .google .devtools .build .lib .cmdline .Label ;
27
27
import com .google .devtools .build .lib .packages .semantics .BuildLanguageOptions ;
28
28
import com .google .devtools .build .lib .vfs .FileSystemUtils ;
@@ -267,9 +267,7 @@ public void testRuleExportedWithSpecifiedName() throws Exception {
267
267
268
268
Module unused =
269
269
skydocMain .eval (
270
- StarlarkSemantics .builder ()
271
- .setBool (BuildLanguageOptions .INCOMPATIBLE_REMOVE_RULE_NAME_PARAMETER , false )
272
- .build (),
270
+ StarlarkSemantics .DEFAULT ,
273
271
Label .parseAbsoluteUnchecked ("//test:test.bzl" ),
274
272
ruleInfoMap ,
275
273
ImmutableMap .builder (),
@@ -296,9 +294,7 @@ public void testUnassignedRuleNotDocumented() throws Exception {
296
294
297
295
Module unused =
298
296
skydocMain .eval (
299
- StarlarkSemantics .builder ()
300
- .setBool (BuildLanguageOptions .INCOMPATIBLE_REMOVE_RULE_NAME_PARAMETER , false )
301
- .build (),
297
+ StarlarkSemantics .DEFAULT ,
302
298
Label .parseAbsoluteUnchecked ("//test:test.bzl" ),
303
299
ruleInfoMap ,
304
300
ImmutableMap .builder (),
You can’t perform that action at this time.
0 commit comments