Remove @DonotCall from FluentIterable.from(FluentIterable).

RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=314570253
google · Jun 4, 2020 · eee079f · eee079f
1 parent 592202a
commit eee079f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/android/guava-tests/test/com/google/common/collect/FluentIterableTest.java b/android/guava-tests/test/com/google/common/collect/FluentIterableTest.java
@@ -76,7 +76,7 @@ public void testFrom() {
         Lists.newArrayList(FluentIterable.from(ImmutableList.of(1, 2, 3, 4))));
   }
 
-  @SuppressWarnings({"deprecation", "DoNotCall"}) // test of deprecated method
+  @SuppressWarnings("deprecation") // test of deprecated method
   public void testFrom_alreadyFluentIterable() {
     FluentIterable<Integer> iterable = FluentIterable.from(asList(1));
     assertSame(iterable, FluentIterable.from(iterable));

diff --git a/android/guava/src/com/google/common/collect/FluentIterable.java b/android/guava/src/com/google/common/collect/FluentIterable.java
@@ -24,7 +24,6 @@
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.errorprone.annotations.DoNotCall;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
@@ -174,7 +173,6 @@ public static <E> FluentIterable<E> from(E[] elements) {
    *     FluentIterable}
    */
   @Deprecated
-  @DoNotCall("instances of FluentIterable don't need to be converted to a FluentIterable")
   public static <E> FluentIterable<E> from(FluentIterable<E> iterable) {
     return checkNotNull(iterable);
   }

diff --git a/guava-tests/test/com/google/common/collect/FluentIterableTest.java b/guava-tests/test/com/google/common/collect/FluentIterableTest.java
@@ -80,7 +80,7 @@ public void testFrom() {
         Lists.newArrayList(FluentIterable.from(ImmutableList.of(1, 2, 3, 4))));
   }
 
-  @SuppressWarnings({"deprecation", "DoNotCall"}) // test of deprecated method
+  @SuppressWarnings("deprecation") // test of deprecated method
   public void testFrom_alreadyFluentIterable() {
     FluentIterable<Integer> iterable = FluentIterable.from(asList(1));
     assertSame(iterable, FluentIterable.from(iterable));

diff --git a/guava/src/com/google/common/collect/FluentIterable.java b/guava/src/com/google/common/collect/FluentIterable.java
@@ -24,7 +24,6 @@
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.errorprone.annotations.DoNotCall;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
@@ -171,7 +170,6 @@ public static <E> FluentIterable<E> from(E[] elements) {
    *     FluentIterable}
    */
   @Deprecated
-  @DoNotCall("instances of FluentIterable don't need to be converted to a FluentIterable")
   public static <E> FluentIterable<E> from(FluentIterable<E> iterable) {
     return checkNotNull(iterable);
   }