diff --git a/android/guava-tests/benchmark/com/google/common/collect/InternersBenchmark.java b/android/guava-tests/benchmark/com/google/common/collect/InternersBenchmark.java index 2b7ef36c700a..2b6a8c011488 100644 --- a/android/guava-tests/benchmark/com/google/common/collect/InternersBenchmark.java +++ b/android/guava-tests/benchmark/com/google/common/collect/InternersBenchmark.java @@ -28,7 +28,7 @@ public class InternersBenchmark { int weakInterner(int reps) { Interner interner = Interners.newWeakInterner(); for (int i = 0; i < reps; i++) { - interner.intern(Double.toHexString(Math.random())); + String unused = interner.intern(Double.toHexString(Math.random())); } return reps; } @@ -37,7 +37,7 @@ int weakInterner(int reps) { int strongInterner(int reps) { Interner interner = Interners.newStrongInterner(); for (int i = 0; i < reps; i++) { - interner.intern(Double.toHexString(Math.random())); + String unused = interner.intern(Double.toHexString(Math.random())); } return reps; } diff --git a/android/guava-tests/test/com/google/common/collect/BenchmarkHelpers.java b/android/guava-tests/test/com/google/common/collect/BenchmarkHelpers.java index 65d2ef6f46e7..0a524fca4475 100644 --- a/android/guava-tests/test/com/google/common/collect/BenchmarkHelpers.java +++ b/android/guava-tests/test/com/google/common/collect/BenchmarkHelpers.java @@ -386,7 +386,7 @@ public enum InternerImpl implements InternerImplEnum { public Interner create(Collection contents) { Interner interner = Interners.newWeakInterner(); for (E e : contents) { - interner.intern(e); + E unused = interner.intern(e); } return interner; } @@ -396,7 +396,7 @@ public Interner create(Collection contents) { public Interner create(Collection contents) { Interner interner = Interners.newStrongInterner(); for (E e : contents) { - interner.intern(e); + E unused = interner.intern(e); } return interner; } diff --git a/android/guava/src/com/google/common/collect/Interner.java b/android/guava/src/com/google/common/collect/Interner.java index bfc2035f101b..d98632598602 100644 --- a/android/guava/src/com/google/common/collect/Interner.java +++ b/android/guava/src/com/google/common/collect/Interner.java @@ -17,7 +17,6 @@ package com.google.common.collect; import com.google.common.annotations.GwtIncompatible; -import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.DoNotMock; /** @@ -47,6 +46,5 @@ public interface Interner { * * @throws NullPointerException if {@code sample} is null */ - @CanIgnoreReturnValue // TODO(cpovirk): Consider removing this? E intern(E sample); } diff --git a/guava-tests/benchmark/com/google/common/collect/InternersBenchmark.java b/guava-tests/benchmark/com/google/common/collect/InternersBenchmark.java index 2b7ef36c700a..2b6a8c011488 100644 --- a/guava-tests/benchmark/com/google/common/collect/InternersBenchmark.java +++ b/guava-tests/benchmark/com/google/common/collect/InternersBenchmark.java @@ -28,7 +28,7 @@ public class InternersBenchmark { int weakInterner(int reps) { Interner interner = Interners.newWeakInterner(); for (int i = 0; i < reps; i++) { - interner.intern(Double.toHexString(Math.random())); + String unused = interner.intern(Double.toHexString(Math.random())); } return reps; } @@ -37,7 +37,7 @@ int weakInterner(int reps) { int strongInterner(int reps) { Interner interner = Interners.newStrongInterner(); for (int i = 0; i < reps; i++) { - interner.intern(Double.toHexString(Math.random())); + String unused = interner.intern(Double.toHexString(Math.random())); } return reps; } diff --git a/guava-tests/test/com/google/common/collect/BenchmarkHelpers.java b/guava-tests/test/com/google/common/collect/BenchmarkHelpers.java index 65d2ef6f46e7..0a524fca4475 100644 --- a/guava-tests/test/com/google/common/collect/BenchmarkHelpers.java +++ b/guava-tests/test/com/google/common/collect/BenchmarkHelpers.java @@ -386,7 +386,7 @@ public enum InternerImpl implements InternerImplEnum { public Interner create(Collection contents) { Interner interner = Interners.newWeakInterner(); for (E e : contents) { - interner.intern(e); + E unused = interner.intern(e); } return interner; } @@ -396,7 +396,7 @@ public Interner create(Collection contents) { public Interner create(Collection contents) { Interner interner = Interners.newStrongInterner(); for (E e : contents) { - interner.intern(e); + E unused = interner.intern(e); } return interner; } diff --git a/guava/src/com/google/common/collect/Interner.java b/guava/src/com/google/common/collect/Interner.java index bfc2035f101b..d98632598602 100644 --- a/guava/src/com/google/common/collect/Interner.java +++ b/guava/src/com/google/common/collect/Interner.java @@ -17,7 +17,6 @@ package com.google.common.collect; import com.google.common.annotations.GwtIncompatible; -import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.DoNotMock; /** @@ -47,6 +46,5 @@ public interface Interner { * * @throws NullPointerException if {@code sample} is null */ - @CanIgnoreReturnValue // TODO(cpovirk): Consider removing this? E intern(E sample); }