pkg/unittest: using matcher and mock from packages

pkg/unittest/lib/matcher.dart

Index: pkg/unittest/lib/matcher.dart
diff --git a/pkg/unittest/lib/matcher.dart b/pkg/unittest/lib/matcher.dart
index f2079938c35eb254ceffd2274694fd5d62598912..3fd692e13440419d1801a89bc8bff687c5936360 100644
--- a/pkg/unittest/lib/matcher.dart
+++ b/pkg/unittest/lib/matcher.dart
@@ -1,37 +1,12 @@
 // Copyright (c) 2013, 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.
-/**
- * Support for specifying test expectations,
- * such as for unit tests.
- *
- * This library is included in the
- * [unittest package on pub.dartlang.org]
- * (http://pub.dartlang.org/packages/unittest).
- * Import this library into your Dart code with:
- *
- *     import 'package:unittest/matcher.dart';
- *
- * The matcher library provides a third-generation assertion mechanism, drawing
- * inspiration from [Hamcrest](http://code.google.com/p/hamcrest/).
- * For more information, see
- * [Unit Testing with Dart]
- * (http://www.dartlang.org/articles/dart-unit-tests/).
- */
-library unittest.matcher;
-
-import 'dart:async';
 
-import 'src/pretty_print.dart';
-import 'src/utils.dart';
+/// `unittest.matcher` has been moved to the `matcher` package.
+///
+/// Add `matcher` to your `pubspec.yaml` file and import it via
+/// `import 'package:matcher/matcher.dart';`
+@deprecated
+library unittest.matcher;
 
-part 'src/iterable_matchers.dart';
-part 'src/core_matchers.dart';
-part 'src/description.dart';
-part 'src/expect.dart';
-part 'src/future_matchers.dart';
-part 'src/interfaces.dart';
-part 'src/map_matchers.dart';
-part 'src/numeric_matchers.dart';
-part 'src/operator_matchers.dart';
-part 'src/string_matchers.dart';
+export 'package:matcher/matcher.dart';