Skip to content

Commit 5f54700

Browse files
phoenix384tumbarumba
authored andcommitted
Use "<? super T>" for all arguments of anyOf
fixes #256
1 parent 133ac3d commit 5f54700

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

hamcrest/src/main/java/org/hamcrest/Matchers.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<? super
9898
* For example:
9999
* <pre>assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))</pre>
100100
*/
101-
public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<T> first, org.hamcrest.Matcher<? super T> second) {
101+
public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<? super T> first, org.hamcrest.Matcher<? super T> second) {
102102
return org.hamcrest.core.AnyOf.anyOf(first, second);
103103
}
104104

@@ -107,7 +107,7 @@ public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<T> first
107107
* For example:
108108
* <pre>assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))</pre>
109109
*/
110-
public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third) {
110+
public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<? super T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third) {
111111
return org.hamcrest.core.AnyOf.anyOf(first, second, third);
112112
}
113113

@@ -116,7 +116,7 @@ public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<T> first
116116
* For example:
117117
* <pre>assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))</pre>
118118
*/
119-
public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third, org.hamcrest.Matcher<? super T> fourth) {
119+
public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<? super T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third, org.hamcrest.Matcher<? super T> fourth) {
120120
return org.hamcrest.core.AnyOf.anyOf(first, second, third, fourth);
121121
}
122122

@@ -125,7 +125,7 @@ public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<T> first
125125
* For example:
126126
* <pre>assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))</pre>
127127
*/
128-
public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third, org.hamcrest.Matcher<? super T> fourth, org.hamcrest.Matcher<? super T> fifth) {
128+
public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<? super T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third, org.hamcrest.Matcher<? super T> fourth, org.hamcrest.Matcher<? super T> fifth) {
129129
return org.hamcrest.core.AnyOf.anyOf(first, second, third, fourth, fifth);
130130
}
131131

@@ -134,7 +134,7 @@ public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<T> first
134134
* For example:
135135
* <pre>assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))</pre>
136136
*/
137-
public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third, org.hamcrest.Matcher<? super T> fourth, org.hamcrest.Matcher<? super T> fifth, org.hamcrest.Matcher<? super T> sixth) {
137+
public static <T> org.hamcrest.core.AnyOf<T> anyOf(org.hamcrest.Matcher<? super T> first, org.hamcrest.Matcher<? super T> second, org.hamcrest.Matcher<? super T> third, org.hamcrest.Matcher<? super T> fourth, org.hamcrest.Matcher<? super T> fifth, org.hamcrest.Matcher<? super T> sixth) {
138138
return org.hamcrest.core.AnyOf.anyOf(first, second, third, fourth, fifth, sixth);
139139
}
140140

0 commit comments

Comments
 (0)