Move @nullable annotations to the proper places.

Closes bazelbuild#13161. PiperOrigin-RevId: 365034037
Bencodes · Mar 25, 2021 · b65e38d · b65e38d
1 parent ed6ea5e
commit b65e38d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -129,8 +129,7 @@ abstract static class Builder {
 
       abstract Builder setPropagatingAspects(List<Aspect> 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
@@ -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;
     }