diff options
author | 2018-03-22 03:54:13 -0700 | |
---|---|---|
committer | 2018-03-22 03:55:33 -0700 | |
commit | 72d51094d3bb5c835650abdb362a9bd4d1a2fef6 (patch) | |
tree | d9d096193f6ad765b80d5ca6ca2ed7542d1a7541 /src/main/java/com | |
parent | 1d182e9318442cbbc0354f0522956ac1e2fd64ef (diff) |
Remove the flag --incompatible_show_all_print_messages
RELNOTES[INC]: The flag --incompatible_show_all_print_messages is removed.
Messages generated by `print` statements from any package will be displayed as
DEBUG messages.
PiperOrigin-RevId: 190043451
Diffstat (limited to 'src/main/java/com')
4 files changed, 1 insertions, 30 deletions
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 94e7c91ab0..ab6e6ed79d 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 @@ -55,7 +55,6 @@ public final class SkylarkSemanticsCodec implements ObjectCodec<SkylarkSemantics codedOut.writeBoolNoTag(semantics.incompatibleNewActionsApi()); codedOut.writeBoolNoTag(semantics.incompatibleRemoveNativeGitRepository()); codedOut.writeBoolNoTag(semantics.incompatibleRemoveNativeHttpArchive()); - codedOut.writeBoolNoTag(semantics.incompatibleShowAllPrintMessages()); codedOut.writeBoolNoTag(semantics.incompatibleStringIsNotIterable()); codedOut.writeBoolNoTag(semantics.internalSkylarkFlagTestCanary()); } @@ -78,7 +77,6 @@ public final class SkylarkSemanticsCodec implements ObjectCodec<SkylarkSemantics builder.incompatibleNewActionsApi(codedIn.readBool()); builder.incompatibleRemoveNativeGitRepository(codedIn.readBool()); builder.incompatibleRemoveNativeHttpArchive(codedIn.readBool()); - builder.incompatibleShowAllPrintMessages(codedIn.readBool()); builder.incompatibleStringIsNotIterable(codedIn.readBool()); builder.internalSkylarkFlagTestCanary(codedIn.readBool()); diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java index 6db4386d5b..b61f73094e 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java +++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java @@ -206,20 +206,6 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable public boolean incompatibleRemoveNativeHttpArchive; @Option( - name = "incompatible_show_all_print_messages", - defaultValue = "true", - category = "incompatible changes", - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, - effectTags = {OptionEffectTag.UNKNOWN}, - metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, - help = - "If set to true, the print function will generate DEBUG messages that aren't affected by " - + "the --output_filter option. Otherwise it will generate filterable WARNING " - + "messages." - ) - public boolean incompatibleShowAllPrintMessages; - - @Option( name = "incompatible_string_is_not_iterable", defaultValue = "false", category = "incompatible changes", @@ -257,7 +243,6 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable .incompatibleNewActionsApi(incompatibleNewActionsApi) .incompatibleRemoveNativeGitRepository(incompatibleRemoveNativeGitRepository) .incompatibleRemoveNativeHttpArchive(incompatibleRemoveNativeHttpArchive) - .incompatibleShowAllPrintMessages(incompatibleShowAllPrintMessages) .incompatibleStringIsNotIterable(incompatibleStringIsNotIterable) .internalSkylarkFlagTestCanary(internalSkylarkFlagTestCanary) .build(); diff --git a/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java b/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java index 9856c7a3a3..83d954daf4 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java @@ -2152,10 +2152,7 @@ public class MethodLibrary { if (env.getSemantics().internalSkylarkFlagTestCanary()) { msg += "<== skylark flag test ==>"; } - env.handleEvent( - env.getSemantics().incompatibleShowAllPrintMessages() - ? Event.debug(loc, msg) - : Event.warn(loc, msg)); + env.handleEvent(Event.debug(loc, msg)); return Runtime.NONE; } }; diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java index 427a939a45..fc9edda407 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java @@ -53,7 +53,6 @@ public abstract class SkylarkSemantics { public abstract boolean incompatibleDisallowUncalledSetConstructor(); public abstract boolean incompatibleNewActionsApi(); - public abstract boolean incompatibleShowAllPrintMessages(); public abstract boolean incompatibleRemoveNativeGitRepository(); @@ -89,7 +88,6 @@ public abstract class SkylarkSemantics { .incompatibleNewActionsApi(false) .incompatibleRemoveNativeGitRepository(false) .incompatibleRemoveNativeHttpArchive(false) - .incompatibleShowAllPrintMessages(true) .incompatibleStringIsNotIterable(false) .internalSkylarkFlagTestCanary(false) .build(); @@ -101,23 +99,16 @@ public abstract class SkylarkSemantics { // <== Add new options here in alphabetic order ==> public abstract Builder incompatibleBzlDisallowLoadAfterStatement(boolean value); public abstract Builder incompatibleDepsetIsNotIterable(boolean value); - public abstract Builder incompatibleDepsetUnion(boolean value); - public abstract Builder incompatibleDisableGlobTracking(boolean value); public abstract Builder incompatibleDisableObjcProviderResources(boolean value); - 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); - - public abstract Builder incompatibleShowAllPrintMessages(boolean value); public abstract Builder incompatibleStringIsNotIterable(boolean value); public abstract Builder internalSkylarkFlagTestCanary(boolean value); |