Fix type signature of ExpectedException#except()

src/main/java/org/hamcrest/junit/ExpectedException.java

@@ -170,7 +170,7 @@ public Statement apply(Statement base,
      *     throw e;
      * }</pre>
      */
-    public void expect(Matcher<?> matcher) {
+    public void expect(Matcher<? super Throwable> matcher) {
         matcherBuilder.add(matcher);
     }
 

src/main/java/org/hamcrest/junit/ExpectedExceptionMatcherBuilder.java

@@ -1,7 +1,6 @@
 package org.hamcrest.junit;
 
 import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.junit.JUnitMatchers.isThrowable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,34 +12,18 @@
  */
 class ExpectedExceptionMatcherBuilder {
 
-    private final List<Matcher<?>> matchers = new ArrayList<Matcher<?>>();
+    private final List<Matcher<? super Throwable>> matchers = new ArrayList<>();
 
-    void add(Matcher<?> matcher) {
+    void add(Matcher<? super Throwable> matcher) {
         matchers.add(matcher);
     }
 
     boolean expectsThrowable() {
         return !matchers.isEmpty();
     }
 
-    Matcher<Throwable> build() {
-        return isThrowable(allOfTheMatchers());
+    Matcher<? super Throwable> build() {
+        return allOf(matchers);
     }
 
-    private Matcher<Throwable> allOfTheMatchers() {
-        if (matchers.size() == 1) {
-            return cast(matchers.get(0));
-        }
-        return allOf(castedMatchers());
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    private List<Matcher<? super Throwable>> castedMatchers() {
-        return new ArrayList<Matcher<? super Throwable>>((List) matchers);
-    }
-
-    @SuppressWarnings("unchecked")
-    private Matcher<Throwable> cast(Matcher<?> singleMatcher) {
-        return (Matcher<Throwable>) singleMatcher;
-    }
 }

src/test/java/org/hamcrest/junit/ExpectedExceptionTest.java

@@ -227,7 +227,7 @@ public static class ExpectsMatcher {
 
         @Test
         public void throwsMore() {
-            thrown.expect(any(Exception.class));
+            thrown.expect(instanceOf(Exception.class));
             throw new NullPointerException("Ack!");
         }
     }