mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
6abe431abe
* Add 'doc' to JAVA_PKG_IUSE * https for HOMEPAGE * SRC_URI, use github instead of mirror://gentoo Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/26822 Signed-off-by: Florian Schmaus <flow@gentoo.org>
45 lines
2.2 KiB
Diff
45 lines
2.2 KiB
Diff
--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
|
|
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
|
|
@@ -122,7 +122,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher
|
|
*/
|
|
@Factory
|
|
public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {
|
|
- return containsInAnyOrder(Arrays.asList(itemMatchers));
|
|
+ return containsInAnyOrder((List<Matcher<? super T>>) Arrays.asList(itemMatchers));
|
|
}
|
|
|
|
/**
|
|
--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
|
|
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
|
|
@@ -138,7 +138,7 @@ public class IsIterableContainingInOrder<E> extends TypeSafeDiagnosingMatcher<It
|
|
*/
|
|
@Factory
|
|
public static <E> Matcher<Iterable<? extends E>> contains(Matcher<? super E>... itemMatchers) {
|
|
- return contains(asList(itemMatchers));
|
|
+ return contains((List<Matcher<? super E>>) asList(itemMatchers));
|
|
}
|
|
|
|
/**
|
|
--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
|
|
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
|
|
@@ -55,7 +55,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> {
|
|
*/
|
|
@Factory
|
|
public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
|
|
- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
|
|
+ return arrayContainingInAnyOrder((List<Matcher<? super E>>) Arrays.asList(itemMatchers));
|
|
}
|
|
|
|
/**
|
|
--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
|
|
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
|
|
@@ -69,7 +69,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> {
|
|
*/
|
|
@Factory
|
|
public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {
|
|
- return arrayContaining(asList(itemMatchers));
|
|
+ return arrayContaining((List<Matcher<? super E>>) asList(itemMatchers));
|
|
}
|
|
|
|
/**
|