More uses of the new try-catch syntax.

pkg/unittest/core_matchers.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 
 /**
  * Returns a matcher that matches empty strings, maps or collections.
  */
 final Matcher isEmpty = const _Empty();
 
@@ skipping 282 matching lines @@
         }
       }));
 
       // It hasn't failed yet.
       return true;
     }
 
     try {
       item();
       return false;
-    } catch (final e, final s) {
+    } catch (e, s) {
       if (_matcher == null ||_matcher.matches(e, matchState)) {
         return true;
       } else {
         matchState.state = {
             'exception' :e,
             'stack': s
         };
         return false;
       }
     }
@@ skipping 26 matching lines @@
   }
 }
 
 class _ReturnsNormally extends BaseMatcher {
   const _ReturnsNormally();
 
   bool matches(f, MatchState matchState) {
     try {
       f();
       return true;
-    } catch (final e, final s) {
+    } catch (e, s) {
       matchState.state = {
           'exception' : e,
           'stack': s
       };
       return false;
     }
   }
 
   Description describe(Description description) =>
       description.add("return normally");
@@ skipping 170 matching lines @@
                                MatchState matchState, bool verbose) {
     super.describeMismatch(item, mismatchDescription, matchState, verbose);
     try {
       // We want to generate a different description if there is no length
       // property. This is harmless code that will throw if no length property
       // but subtle enough that an optimizer shouldn't strip it out.
       if (item.length * item.length >= 0) {
         return mismatchDescription.add(' with length of ').
             addDescriptionOf(item.length);
       }
-    } catch (var e) {
+    } catch (e) {
       return mismatchDescription.add(' has no length property');
     }
   }
 }
 
 /**
  * Returns a matcher that matches if the match argument contains
  * the expected value. For [String]s this means substring matching;
  * for [Map]s is means the map has the key, and for [Collection]s it
  * means the collection has a matching element. In the case of collections,
@@ skipping 65 matching lines @@
   final _matcher;
   final String _description;
 
   const _Predicate(this._matcher, this._description);
 
   bool matches(item, MatchState matchState) => _matcher(item);
 
   Description describe(Description description) =>
       description.add(_description);
 }