From 75dd2ceb505380a918bec2cb3d3096a6b362574c Mon Sep 17 00:00:00 2001
From: Pete Bentley <prb@google.com>
Date: Mon, 22 Feb 2021 18:49:01 +0000
Subject: Extra generic type information to aid certain javacs.

In particular this is needed for the code to compile using
the error prone analyzer.

This change re-lands https://r.android.com/1601633

Bug: 129054170
Test: m
Change-Id: I1ebe37da89049dcc72c8a0d6b65757e7a8292cfc
(cherry picked from commit a0b1fd6752e65aaeaddb1684cdbb1baabfa85433)
---
 src/main/java/org/junit/matchers/JUnitMatchers.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/org')

diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java
index 13407cc..37e3d68 100644
--- a/src/main/java/org/junit/matchers/JUnitMatchers.java
+++ b/src/main/java/org/junit/matchers/JUnitMatchers.java
@@ -48,7 +48,7 @@ public class JUnitMatchers {
      */
     @Deprecated
     public static <T> Matcher<Iterable<T>> hasItems(Matcher<? super T>... elementMatchers) {
-        return CoreMatchers.hasItems(elementMatchers);
+        return CoreMatchers.<T>hasItems(elementMatchers);
     }
 
     /**
@@ -57,7 +57,7 @@ public class JUnitMatchers {
      */
     @Deprecated
     public static <T> Matcher<Iterable<T>> everyItem(final Matcher<T> elementMatcher) {
-        return CoreMatchers.everyItem(elementMatcher);
+      return CoreMatchers.everyItem((Matcher) elementMatcher);
     }
 
     /**
-- 
cgit v1.2.3