From 469079377a9561a7c2cc7a46492c44e012b9fb33 Mon Sep 17 00:00:00 2001 From: vladmos Date: Fri, 30 Jun 2017 14:01:45 +0200 Subject: Refactor Printer It's now easier to customize Printer if in different situations objects should be printed differently. Also its API is cleaner now. Names of methods of SkylarkValue objects now reflect names of Skylark functions: SkylarkValue#repr and SkylarkPrintableValue#str. PiperOrigin-RevId: 160635154 --- .../devtools/build/lib/rules/config/ConfigFeatureFlag.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/config') diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java index 5b9ddb780e..79d595baf7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java +++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlag.java @@ -57,7 +57,7 @@ public class ConfigFeatureFlag implements RuleConfiguredTargetFactory { ruleContext.attributeError( "allowed_values", "cannot contain duplicates, but contained multiple of " - + Printer.repr(duplicates.build(), '\'')); + + Printer.repr(duplicates.build())); } String defaultValue = ruleContext.attributes().get("default_value", STRING); @@ -65,9 +65,9 @@ public class ConfigFeatureFlag implements RuleConfiguredTargetFactory { ruleContext.attributeError( "default_value", "must be one of " - + Printer.repr(values.asList(), '\'') + + Printer.repr(values.asList()) + ", but was " - + Printer.repr(defaultValue, '\'')); + + Printer.repr(defaultValue)); } if (ruleContext.hasErrors()) { @@ -86,9 +86,9 @@ public class ConfigFeatureFlag implements RuleConfiguredTargetFactory { // TODO(mstaib): When configurationError is available, use that instead. ruleContext.ruleError( "value must be one of " - + Printer.repr(values.asList(), '\'') + + Printer.repr(values.asList()) + ", but was " - + Printer.repr(value, '\'')); + + Printer.repr(value)); return null; } -- cgit v1.2.3