commit ba55fb37ca4dffb3f27e1ef0bab77d2bea8a4808
author Leaf Petersen <leafpetersen@users.noreply.github.com> Wed Aug 30 15:21:52 2017 -0700
committer Kevin Moore <kevmoo@users.noreply.github.com> Wed Aug 30 15:21:52 2017 -0700
tree 3e2aebded3c2608a298d00837e15d3e6a928094a
parent a4dc3ff442902e4bfff08947db70fb4f728aeec7

Change wrapMatcher to avoid relying on fuzzy arrows (#58)

lib/src/util.dart

diff --git a/lib/src/util.dart b/lib/src/util.dart
index 112819b..7e7ff05 100644
--- a/lib/src/util.dart
+++ b/lib/src/util.dart
@@ -5,7 +5,7 @@
 import 'core_matchers.dart';
 import 'interfaces.dart';
 
-typedef bool _Predicate(value);
+typedef bool _Predicate<T>(T value);
 
 /// A [Map] between whitespace characters and their escape sequences.
 const _escapeMap = const {
@@ -38,8 +38,13 @@
 Matcher wrapMatcher(x) {
   if (x is Matcher) {
     return x;
-  } else if (x is _Predicate) {
+  } else if (x is _Predicate<Object>) {
+    // x is already a predicate that can handle anything
     return predicate(x);
+  } else if (x is _Predicate<Null>) {
+    // x is a unary predicate, but expects a specific type
+    // so wrap it.
+    return predicate((a) => (x as dynamic)(a));
   } else {
     return equals(x);
   }