From 77b825b1ffb79fdb0fef6097b706bde3838afb45 Mon Sep 17 00:00:00 2001
From: kak <kak@google.com>
Date: Tue, 15 Dec 2015 16:47:43 -0800
Subject: [PATCH] Change assertThat(Iterable<T>) to assertThat(Iterable<?>).
 Change assertThat(Multiset<E>) to assertThat(Multiset<?>).

See https://github.com/google/truth/issues/192
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=110310085
---
 core/src/main/java/com/google/common/truth/TestVerb.java | 6 ++----
 core/src/main/java/com/google/common/truth/Truth.java    | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/com/google/common/truth/TestVerb.java b/core/src/main/java/com/google/common/truth/TestVerb.java
index ea4a71a74..eb240209b 100644
--- a/core/src/main/java/com/google/common/truth/TestVerb.java
+++ b/core/src/main/java/com/google/common/truth/TestVerb.java
@@ -108,8 +108,7 @@ public StringSubject that(@Nullable String target) {
     return new StringSubject(getFailureStrategy(), target);
   }
 
-  // TODO(b/26080262): Remove the <T> type param
-  public <T> IterableSubject that(@Nullable Iterable<T> target) {
+  public IterableSubject that(@Nullable Iterable<?> target) {
     return new IterableSubject(getFailureStrategy(), target);
   }
 
@@ -169,8 +168,7 @@ public SetMultimapSubject that(@Nullable SetMultimap<?, ?> target) {
     return new SetMultimapSubject(getFailureStrategy(), target);
   }
 
-  // TODO(b/26080262): Remove the <E> type param
-  public <E> MultisetSubject that(@Nullable Multiset<E> target) {
+  public MultisetSubject that(@Nullable Multiset<?> target) {
     return new MultisetSubject(getFailureStrategy(), target);
   }
 
diff --git a/core/src/main/java/com/google/common/truth/Truth.java b/core/src/main/java/com/google/common/truth/Truth.java
index 006072bbb..4c117d845 100644
--- a/core/src/main/java/com/google/common/truth/Truth.java
+++ b/core/src/main/java/com/google/common/truth/Truth.java
@@ -162,8 +162,7 @@ public static StringSubject assertThat(@Nullable String target) {
     return assert_().that(target);
   }
 
-  // TODO(b/26080262): Remove the <T> type param
-  public static <T> IterableSubject assertThat(@Nullable Iterable<T> target) {
+  public static IterableSubject assertThat(@Nullable Iterable<?> target) {
     return assert_().that(target);
   }
 
@@ -223,8 +222,7 @@ public static SetMultimapSubject assertThat(@Nullable SetMultimap<?, ?> target)
     return assert_().that(target);
   }
 
-  // TODO(b/26080262): Remove the <E> type param
-  public static <E> MultisetSubject assertThat(@Nullable Multiset<E> target) {
+  public static MultisetSubject assertThat(@Nullable Multiset<?> target) {
     return assert_().that(target);
   }