Fix ReferenceEquality and BoxingComparator ErrorProne warnings PiperOrigin-RevId: 969841008 Change-Id: Id7fa8e274db48b1c89b5f1e4b3c1cdbb51675932
diff --git a/src/main/java/com/google/devtools/build/lib/remote/util/DigestUtil.java b/src/main/java/com/google/devtools/build/lib/remote/util/DigestUtil.java index 6c0cf29..cecc580 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/util/DigestUtil.java +++ b/src/main/java/com/google/devtools/build/lib/remote/util/DigestUtil.java
@@ -47,7 +47,7 @@ public class DigestUtil { public static final Comparator<Digest> DIGEST_COMPARATOR = comparing(Digest::getHashBytes, ByteString.unsignedLexicographicalComparator()) - .thenComparing(Digest::getSizeBytes); + .thenComparingLong(Digest::getSizeBytes); private final XattrProvider xattrProvider; private final DigestHashFunction hashFn;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkInternal.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkInternal.java index f5efff0..d58b5ad 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkInternal.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkInternal.java
@@ -1128,7 +1128,7 @@ documented = false, parameters = {@Param(name = "fn")}) public void checkToplevel(StarlarkFunction fn) throws EvalException { - if (fn.getModule().getGlobal(fn.getName()) != fn) { + if (!Objects.equals(fn.getModule().getGlobal(fn.getName()), fn)) { throw Starlark.errorf("Passed function must be top-level functions."); } }