From b65e38d854e35b6a0f5adb289a328d597092d7df Mon Sep 17 00:00:00 2001 From: John Cater Date: Thu, 25 Mar 2021 07:41:52 -0700 Subject: [PATCH] Move @Nullable annotations to the proper places. Closes #13161. PiperOrigin-RevId: 365034037 --- .../google/devtools/build/lib/analysis/DependencyResolver.java | 3 +-- .../devtools/build/lib/skyframe/ConfiguredTargetKey.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java index aee3dee5733382..7fae5a58c806ec 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java @@ -129,8 +129,7 @@ abstract static class Builder { abstract Builder setPropagatingAspects(List propagatingAspects); - @Nullable - abstract Builder setToolchainContextKey(ToolchainContextKey toolchainContextKey); + abstract Builder setToolchainContextKey(@Nullable ToolchainContextKey toolchainContextKey); abstract PartiallyResolvedDependency build(); } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetKey.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetKey.java index 2a2ab222ebf2ef..52057ca32e4c13 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetKey.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetKey.java @@ -234,7 +234,7 @@ public Builder setConfigurationKey(@Nullable BuildConfigurationValue.Key configu * Sets the {@link ToolchainContextKey} this configured target should use for toolchain * resolution. When present, this overrides the normally determined toolchain context. */ - public Builder setToolchainContextKey(ToolchainContextKey toolchainContextKey) { + public Builder setToolchainContextKey(@Nullable ToolchainContextKey toolchainContextKey) { this.toolchainContextKey = toolchainContextKey; return this; }