aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar carmi <carmi@google.com>2018-04-06 11:37:06 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-04-06 11:38:23 -0700
commit9c86fcbe34c9e89bc3c9c60a6970fb736b2fc42d (patch)
tree8200425233a613bef4e5fb3de9df4ef0b630cb97 /src/main
parent551454e7d4e5d2f8d176976d5376236619fbfe0e (diff)
Delete dead code
RELNOTES: None PiperOrigin-RevId: 191916828
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java22
-rw-r--r--src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java4
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/java/ProtoJavaApiInfoProvider.java14
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java35
4 files changed, 3 insertions, 72 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index 043bee78a1..87d16bbd02 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -20,7 +20,6 @@ import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
-import com.google.common.collect.ImmutableBiMap;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableListMultimap;
@@ -331,13 +330,6 @@ public final class RuleContext extends TargetContext
}
/**
- * Attributes from aspects.
- */
- public ImmutableMap<String, Attribute> getAspectAttributes() {
- return attributes.getAspectAttributes();
- }
-
- /**
* All aspects applied to the rule.
*/
public ImmutableList<AspectDescriptor> getAspectDescriptors() {
@@ -1508,15 +1500,6 @@ public final class RuleContext extends TargetContext
return this;
}
- /**
- * Sets a map that indicates which providers should be exported to skylark under the key
- * (map key). These provider types will also be exportable by skylark rules under (map key).
- */
- Builder setSkylarkProvidersRegistry(
- ImmutableBiMap<String, Class<? extends TransitiveInfoProvider>> skylarkProviderRegistry) {
- return this;
- }
-
/** Sets the {@link ToolchainContext} used to access toolchains used by this rule. */
Builder setToolchainContext(ToolchainContext toolchainContext) {
this.toolchainContext = toolchainContext;
@@ -1645,10 +1628,6 @@ public final class RuleContext extends TargetContext
reporter.attributeError(attrName, message);
}
- public void reportWarning(Location location, String message) {
- reporter.reportWarning(location, message);
- }
-
@Override
public void ruleWarning(String message) {
reporter.ruleWarning(message);
@@ -1682,7 +1661,6 @@ public final class RuleContext extends TargetContext
private String badPrerequisiteMessage(
ConfiguredTargetAndData prerequisite, String reason, boolean isWarning) {
- String targetKind = prerequisite.getTarget().getTargetKind();
String msgReason = reason != null ? " (" + reason + ")" : "";
if (isWarning) {
return String.format(
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java b/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java
index ce152820e4..ce5ed3f225 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java
@@ -65,7 +65,7 @@ public class RuleFormatter {
// true), and the attribute has a ComputedDefault value, then we must serialize what it
// evaluates to. The Skylark-defined ComputedDefault function won't be available after
// deserialization due to Skylark's non-serializability.
- valueToSerialize = evaluateSkylarkComputedDefault(rule, rawAttributeMapper, attr);
+ valueToSerialize = evaluateSkylarkComputedDefault(rawAttributeMapper, attr);
if (valueToSerialize == null) {
continue;
}
@@ -106,7 +106,7 @@ public class RuleFormatter {
*/
@Nullable
private static Object evaluateSkylarkComputedDefault(
- Rule rule, RawAttributeMapper rawAttributeMapper, Attribute attr) {
+ RawAttributeMapper rawAttributeMapper, Attribute attr) {
if (SKYLARK_RULE_CLASS_COMPUTED_DEFAULT_ATTRIBUTES.contains(attr.getName())) {
return rawAttributeMapper.get(attr.getName(), attr.getType());
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/ProtoJavaApiInfoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/ProtoJavaApiInfoProvider.java
index c74008b6b0..e823f4bb3b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/ProtoJavaApiInfoProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/ProtoJavaApiInfoProvider.java
@@ -15,13 +15,11 @@ package com.google.devtools.build.lib.rules.java;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
-import java.util.Map;
import javax.annotation.Nullable;
/** An object that provides information about API versions used by a proto library. */
@@ -49,7 +47,6 @@ public abstract class ProtoJavaApiInfoProvider implements TransitiveInfoProvider
JavaCompilationArgs transitiveProtoRuntime1,
JavaCompilationArgs transitiveProtoRuntimeMutable,
JavaCompilationArgs transitiveProtoRuntimeImmutable,
- Map<Artifact, Artifact> compileTimeJarToRuntimeJar,
boolean hasMixedApiVersions,
int apiVersion,
boolean supportsProto1,
@@ -78,8 +75,7 @@ public abstract class ProtoJavaApiInfoProvider implements TransitiveInfoProvider
apiVersion,
supportsProto1,
supportsProto2Mutable,
- hasProto1OnlyDependency,
- ImmutableMap.copyOf(compileTimeJarToRuntimeJar));
+ hasProto1OnlyDependency);
}
/**
@@ -193,12 +189,4 @@ public abstract class ProtoJavaApiInfoProvider implements TransitiveInfoProvider
*/
public abstract boolean hasProto1OnlyDependency();
- /**
- * Returns the runtime jar artifact output created by this proto_libary rule.
- */
- public Artifact getRuntimeJarFor(Artifact compileTimeJar) {
- return getCompileTimeJarToRuntimeJar().get(compileTimeJar);
- }
-
- abstract ImmutableMap<Artifact, Artifact> getCompileTimeJarToRuntimeJar();
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
index 19ff35ad6e..7eb1e2e324 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
@@ -20,7 +20,6 @@ import static com.google.devtools.build.lib.collect.nestedset.Order.STABLE_ORDER
import static com.google.devtools.build.lib.rules.proto.ProtoCommon.areDepsStrict;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
@@ -78,42 +77,11 @@ public class ProtoCompileActionBuilder {
private Iterable<String> additionalCommandLineArguments;
private Iterable<FilesToRunProvider> additionalTools;
- /** Build a proto compiler commandline argument for use in setXParameter methods. */
- public static String buildProtoArg(String arg, String value, Iterable<String> flags) {
- return String.format(
- "--%s=%s%s", arg, (isEmpty(flags) ? "" : Joiner.on(',').join(flags) + ":"), value);
- }
-
- public ProtoCompileActionBuilder setRuleContext(RuleContext ruleContext) {
- this.ruleContext = ruleContext;
- return this;
- }
-
- public ProtoCompileActionBuilder setSupportData(SupportData supportData) {
- this.supportData = supportData;
- return this;
- }
-
- public ProtoCompileActionBuilder setLanguage(String language) {
- this.language = language;
- return this;
- }
-
- public ProtoCompileActionBuilder setLangPrefix(String langPrefix) {
- this.langPrefix = langPrefix;
- return this;
- }
-
public ProtoCompileActionBuilder allowServices(boolean hasServices) {
this.hasServices = hasServices;
return this;
}
- public ProtoCompileActionBuilder setOutputs(Iterable<Artifact> outputs) {
- this.outputs = outputs;
- return this;
- }
-
public ProtoCompileActionBuilder setInputs(Iterable<Artifact> inputs) {
this.inputs = inputs;
return this;
@@ -351,9 +319,6 @@ public class ProtoCompileActionBuilder {
return result;
}
- @VisibleForTesting
- static class ProtoCommandLineArgv {}
-
/** Signifies that a prerequisite could not be satisfied. */
private static class MissingPrerequisiteException extends Exception {}