Skip to content

Commit eee079f

Browse files
kluevernetdpb
authored andcommitted
Remove @DonotCall from FluentIterable.from(FluentIterable).
RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=314570253
1 parent 592202a commit eee079f

File tree

4 files changed

+2
-6
lines changed

4 files changed

+2
-6
lines changed

android/guava-tests/test/com/google/common/collect/FluentIterableTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void testFrom() {
7676
Lists.newArrayList(FluentIterable.from(ImmutableList.of(1, 2, 3, 4))));
7777
}
7878

79-
@SuppressWarnings({"deprecation", "DoNotCall"}) // test of deprecated method
79+
@SuppressWarnings("deprecation") // test of deprecated method
8080
public void testFrom_alreadyFluentIterable() {
8181
FluentIterable<Integer> iterable = FluentIterable.from(asList(1));
8282
assertSame(iterable, FluentIterable.from(iterable));

android/guava/src/com/google/common/collect/FluentIterable.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.google.common.base.Optional;
2525
import com.google.common.base.Predicate;
2626
import com.google.errorprone.annotations.CanIgnoreReturnValue;
27-
import com.google.errorprone.annotations.DoNotCall;
2827
import java.util.Arrays;
2928
import java.util.Collection;
3029
import java.util.Comparator;
@@ -174,7 +173,6 @@ public static <E> FluentIterable<E> from(E[] elements) {
174173
* FluentIterable}
175174
*/
176175
@Deprecated
177-
@DoNotCall("instances of FluentIterable don't need to be converted to a FluentIterable")
178176
public static <E> FluentIterable<E> from(FluentIterable<E> iterable) {
179177
return checkNotNull(iterable);
180178
}

guava-tests/test/com/google/common/collect/FluentIterableTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void testFrom() {
8080
Lists.newArrayList(FluentIterable.from(ImmutableList.of(1, 2, 3, 4))));
8181
}
8282

83-
@SuppressWarnings({"deprecation", "DoNotCall"}) // test of deprecated method
83+
@SuppressWarnings("deprecation") // test of deprecated method
8484
public void testFrom_alreadyFluentIterable() {
8585
FluentIterable<Integer> iterable = FluentIterable.from(asList(1));
8686
assertSame(iterable, FluentIterable.from(iterable));

guava/src/com/google/common/collect/FluentIterable.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.google.common.base.Optional;
2525
import com.google.common.base.Predicate;
2626
import com.google.errorprone.annotations.CanIgnoreReturnValue;
27-
import com.google.errorprone.annotations.DoNotCall;
2827
import java.util.Arrays;
2928
import java.util.Collection;
3029
import java.util.Comparator;
@@ -171,7 +170,6 @@ public static <E> FluentIterable<E> from(E[] elements) {
171170
* FluentIterable}
172171
*/
173172
@Deprecated
174-
@DoNotCall("instances of FluentIterable don't need to be converted to a FluentIterable")
175173
public static <E> FluentIterable<E> from(FluentIterable<E> iterable) {
176174
return checkNotNull(iterable);
177175
}

0 commit comments

Comments
 (0)