Automatic code cleanup. PiperOrigin-RevId: 470225230 Change-Id: I03f0b52fc13a325470af7a10b72ccf16883d34fd
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java index a25b4d3..575d2bf 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java
@@ -1542,7 +1542,9 @@ return this; } + @SuppressWarnings("LenientFormatStringValidation") public HeaderInfo build() { + // Expected 0 args, but got 2. Preconditions.checkState( (separateModule == null || headerModule != null) && (separatePicModule == null || picHeaderModule != null),
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java index 2867d79..2c82d28 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
@@ -1054,6 +1054,7 @@ } /** Create {@code CcCompilationContext} for cc compile action from generated inputs. */ + @SuppressWarnings("LenientFormatStringValidation") private CcCompilationContext.Builder initializeCcCompilationContext(RuleContext ruleContext) throws InterruptedException { CcCompilationContext.Builder ccCompilationContextBuilder = @@ -1144,6 +1145,7 @@ } if (!separateModuleHeaders.isEmpty()) { + // Expected 0 args, but got 1. Preconditions.checkState( featureConfiguration.isEnabled(CppRuleClasses.MODULE_MAPS) && generateModuleMap
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java index 014418a..7a12a44 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
@@ -818,10 +818,12 @@ return getIncludeScannerSources().get(0); } + @SuppressWarnings("LenientFormatStringValidation") @Override public ImmutableList<Artifact> getIncludeScannerSources() { if (getSourceFile().isFileType(CppFileTypes.CPP_MODULE_MAP)) { boolean isSeparate = outputFile.equals(ccCompilationContext.getSeparateHeaderModule(usePic)); + // Expected 0 args, but got 1. Preconditions.checkState( outputFile.equals(ccCompilationContext.getHeaderModule(usePic)) || isSeparate, "Trying to build unknown module",
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java index 326e331..10c5830 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java
@@ -185,6 +185,7 @@ } } + @SuppressWarnings("LenientFormatStringValidation") @Nullable private static TreeArtifactValue createTreeArtifactValueFromActionKey( ArtifactDependencies artifactDependencies, Environment env) throws InterruptedException { @@ -246,6 +247,7 @@ TreeArtifactValue tree = treeBuilder.build(); if (omitted) { + // Expected 1 args, but got 2. Preconditions.checkState( tree.getChildValues().isEmpty(), "Action template expansion has some but not all outputs omitted, present outputs: %s",
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java index d2324f7..168c698 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
@@ -1171,6 +1171,7 @@ return Label.print(((ConfiguredTargetKey) skyKey.argument()).getLabel()); } + @SuppressWarnings("LenientFormatStringValidation") @Nullable private static ConfiguredTargetValue createConfiguredTarget( SkyframeBuildView view, @@ -1261,6 +1262,7 @@ ? null : transitivePackagesForPackageRootResolution.build()); } else { + // Expected 4 args, but got 3. Preconditions.checkState( analysisEnvironment.getRegisteredActions().isEmpty(), "Non-rule can't have actions: %s %s %s",
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/OutputStore.java b/src/main/java/com/google/devtools/build/lib/skyframe/OutputStore.java index 79b3e05..4312b8a 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/OutputStore.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/OutputStore.java
@@ -60,7 +60,9 @@ return treeArtifactData.get(artifact); } + @SuppressWarnings("LenientFormatStringValidation") void putTreeArtifactData(SpecialArtifact treeArtifact, TreeArtifactValue value) { + // Expected 1 args, but got 0. Preconditions.checkArgument(treeArtifact.isTreeArtifact(), "%s is not a tree artifact"); treeArtifactData.put(treeArtifact, value); }
diff --git a/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java b/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java index 35bbb04..f1a8385 100644 --- a/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java +++ b/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java
@@ -83,6 +83,7 @@ private final boolean isTransitivelyTransient; private final boolean isCatastrophic; + @SuppressWarnings("LenientFormatStringValidation") public ErrorInfo( @Nullable Exception exception, ImmutableList<CycleInfo> cycles, @@ -94,10 +95,12 @@ this.isDirectlyTransient = isDirectlyTransient; this.isTransitivelyTransient = isTransitivelyTransient; this.isCatastrophic = isCatastrophic; + // Expected 0 args, but got 1. Preconditions.checkArgument( exception != null || !cycles.isEmpty(), "At least one of exception and cycles must be present", this); + // Expected 0 args, but got 1. Preconditions.checkArgument( !isDirectlyTransient || isTransitivelyTransient, "Cannot be directly transient but not transitively transient",
diff --git a/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java b/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java index c570044..5917ad7 100644 --- a/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java +++ b/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java
@@ -161,9 +161,10 @@ /** Adds a value to the result. An error for this key must not already be present. */ @CanIgnoreReturnValue - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "LenientFormatStringValidation"}) public Builder<T> addResult(SkyKey key, SkyValue value) { result.put(key, Preconditions.checkNotNull((T) value, key)); + // Expected 3 args, but got 2. Preconditions.checkState( !errors.containsKey(key), "%s in both result and errors: %s %s", value, errors); return this; @@ -173,9 +174,11 @@ * Adds an error to the result. A successful value for this key must not already be present. * Publicly visible only for testing: should be package-private. */ + @SuppressWarnings("LenientFormatStringValidation") @CanIgnoreReturnValue public Builder<T> addError(SkyKey key, ErrorInfo error) { errors.put(key, Preconditions.checkNotNull(error, key)); + // Expected 3 args, but got 2. Preconditions.checkState( !result.containsKey(key), "%s in both result and errors: %s %s", error, result); if (error.isCatastrophic()) {
diff --git a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java index edf882c..853759d 100644 --- a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java +++ b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
@@ -280,6 +280,7 @@ * registered during this build (via {@link NodeEntry#getInProgressReverseDeps}. Since we don't * allow a node to build with unfinished deps, those parents cannot have built. */ + @SuppressWarnings("LenientFormatStringValidation") @Nullable private Map<SkyKey, ValueWithMetadata> bubbleErrorUp( final ErrorInfo leafFailure, @@ -362,6 +363,7 @@ roots, rdepsToBubbleUpTo, bubbleErrorInfo); + // Expected 6 args, but got 8. Preconditions.checkState( evaluatorContext.getProgressReceiver().isInflight(parent), "In-progress reverse deps can only include in-flight nodes: " + "%s %s %s %s %s %s", @@ -373,6 +375,7 @@ roots, rdepsToBubbleUpTo, bubbleErrorInfo); + // Expected 6 args, but got 8. Preconditions.checkState( parentEntry.getTemporaryDirectDeps().expensiveContains(errorKey), "In-progress reverse deps can only include nodes that have declared a dep: "
diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java index 0514f38..ca2c29f 100644 --- a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java +++ b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileArchive.java
@@ -43,6 +43,7 @@ } /** Adds a {@code .dex} file with the given details. */ + @SuppressWarnings("LenientFormatStringValidation") @CanIgnoreReturnValue public DexFileArchive addFile(ZipEntry entry, Dex dex) throws IOException { checkState(inUse.compareAndSet(null, entry), "Already in use"); @@ -50,12 +51,15 @@ out.putNextEntry(entry); dex.writeTo(out); out.closeEntry(); + // Expected 0 args, but got 1. checkState(inUse.compareAndSet(entry, null), "Swooped in: ", inUse.get()); return this; } + @SuppressWarnings("LenientFormatStringValidation") @Override public void close() throws IOException { + // Expected 0 args, but got 1. checkState(inUse.get() == null, "Still in use: ", inUse.get()); out.close(); }
diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileSplitter.java b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileSplitter.java index 78ab87d..4e684c8 100644 --- a/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileSplitter.java +++ b/src/tools/android/java/com/google/devtools/build/android/dexer/DexFileSplitter.java
@@ -226,7 +226,9 @@ private DexLimitTracker tracker; private Boolean inCoreLib; + @SuppressWarnings("LenientFormatStringValidation") private DexFileSplitter(Path outputDirectory, int maxNumberOfIdxPerDex) throws IOException { + // Expected 0 args, but got 1. checkArgument(!Files.isRegularFile(outputDirectory), "Must be a directory: ", outputDirectory); this.maxNumberOfIdxPerDex = maxNumberOfIdxPerDex; this.outputDirectory = outputDirectory;