From 13eced72ffe4d617e3fdbafee563d4d7be34a940 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 13 Jun 2018 11:36:46 -0700
Subject: [PATCH 1/6] Move SDK library expectation to all subcategories

---
 pubspec.lock    | 2 +-
 tool/grind.dart | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 19cd01f1fd..b0081a56c1 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -394,4 +394,4 @@ packages:
     source: hosted
     version: "2.1.13"
 sdks:
-  dart: ">=2.0.0-dev.59.0 <=2.0.0-dev.60.0"
+  dart: ">=2.0.0-dev.59.0 <=2.0.0-dev.61.0"
diff --git a/tool/grind.dart b/tool/grind.dart
index 2b943f25e4..1a21c2343b 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -898,8 +898,8 @@ updateTestPackageDocs() async {
 @Task('Validate the SDK doc build.')
 @Depends(buildSdkDocs)
 validateSdkDocs() {
-  const expectedLibCount = 7;
-  const expectedSubLibCount = 12;
+  const expectedLibCount = 0;
+  const expectedSubLibCount = 19;
   File indexHtml = joinFile(sdkDocsDir, ['index.html']);
   if (!indexHtml.existsSync()) {
     fail('no index.html found for SDK docs');

From 0dcfa7cd0c82b690cb7efff760aeace7e4a1ea91 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 13 Jun 2018 12:09:28 -0700
Subject: [PATCH 2/6] Retype has been removed

---
 pubspec.lock                                  |   2 +-
 test/model_test.dart                          |   2 +-
 .../fake/ExtraSpecialList-class.html          |  10 --
 .../ExtraSpecialList/ExtraSpecialList.html    |   1 -
 .../fake/SpecialList-class.html               |  10 --
 .../fake/SpecialList/SpecialList.html         |   1 -
 .../fake/SpecialList/add.html                 |   1 -
 .../fake/SpecialList/addAll.html              |   1 -
 .../fake/SpecialList/any.html                 |   1 -
 .../fake/SpecialList/asMap.html               |   1 -
 .../fake/SpecialList/cast.html                |   1 -
 .../fake/SpecialList/clear.html               |   1 -
 .../fake/SpecialList/contains.html            |   1 -
 .../fake/SpecialList/elementAt.html           |   1 -
 .../fake/SpecialList/every.html               |   1 -
 .../fake/SpecialList/expand.html              |   1 -
 .../fake/SpecialList/fillRange.html           |   1 -
 .../fake/SpecialList/first.html               |   1 -
 .../fake/SpecialList/firstWhere.html          |   1 -
 .../fake/SpecialList/fold.html                |   1 -
 .../fake/SpecialList/followedBy.html          |   1 -
 .../fake/SpecialList/forEach.html             |   1 -
 .../fake/SpecialList/getRange.html            |   1 -
 .../fake/SpecialList/hashCode.html            |   1 -
 .../fake/SpecialList/indexOf.html             |   1 -
 .../fake/SpecialList/indexWhere.html          |   1 -
 .../fake/SpecialList/insert.html              |   1 -
 .../fake/SpecialList/insertAll.html           |   1 -
 .../fake/SpecialList/isEmpty.html             |   1 -
 .../fake/SpecialList/isNotEmpty.html          |   1 -
 .../fake/SpecialList/iterator.html            |   1 -
 .../fake/SpecialList/join.html                |   1 -
 .../fake/SpecialList/last.html                |   1 -
 .../fake/SpecialList/lastIndexOf.html         |   1 -
 .../fake/SpecialList/lastIndexWhere.html      |   1 -
 .../fake/SpecialList/lastWhere.html           |   1 -
 .../fake/SpecialList/length.html              |   1 -
 .../fake/SpecialList/map.html                 |   1 -
 .../fake/SpecialList/noSuchMethod.html        |   1 -
 .../fake/SpecialList/operator_equals.html     |   1 -
 .../fake/SpecialList/operator_get.html        |   1 -
 .../fake/SpecialList/operator_plus.html       |   1 -
 .../fake/SpecialList/operator_put.html        |   1 -
 .../fake/SpecialList/reduce.html              |   1 -
 .../fake/SpecialList/remove.html              |   1 -
 .../fake/SpecialList/removeAt.html            |   1 -
 .../fake/SpecialList/removeLast.html          |   1 -
 .../fake/SpecialList/removeRange.html         |   1 -
 .../fake/SpecialList/removeWhere.html         |   1 -
 .../fake/SpecialList/replaceRange.html        |   1 -
 .../fake/SpecialList/retainWhere.html         |   1 -
 .../fake/SpecialList/retype.html              | 161 ------------------
 .../fake/SpecialList/reversed.html            |   1 -
 .../fake/SpecialList/runtimeType.html         |   1 -
 .../fake/SpecialList/setAll.html              |   1 -
 .../fake/SpecialList/setRange.html            |   1 -
 .../fake/SpecialList/shuffle.html             |   1 -
 .../fake/SpecialList/single.html              |   1 -
 .../fake/SpecialList/singleWhere.html         |   1 -
 .../fake/SpecialList/skip.html                |   1 -
 .../fake/SpecialList/skipWhile.html           |   1 -
 .../fake/SpecialList/sort.html                |   1 -
 .../fake/SpecialList/sublist.html             |   1 -
 .../fake/SpecialList/take.html                |   1 -
 .../fake/SpecialList/takeWhile.html           |   1 -
 .../fake/SpecialList/toList.html              |   1 -
 .../fake/SpecialList/toSet.html               |   1 -
 .../fake/SpecialList/toString.html            |   1 -
 .../fake/SpecialList/where.html               |   1 -
 .../fake/SpecialList/whereType.html           |   1 -
 testing/test_package_docs/index.json          |  11 --
 71 files changed, 2 insertions(+), 259 deletions(-)
 delete mode 100644 testing/test_package_docs/fake/SpecialList/retype.html

diff --git a/pubspec.lock b/pubspec.lock
index b0081a56c1..3f4eddda4a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -394,4 +394,4 @@ packages:
     source: hosted
     version: "2.1.13"
 sdks:
-  dart: ">=2.0.0-dev.59.0 <=2.0.0-dev.61.0"
+  dart: ">=2.0.0-dev.59.0 <=2.0.0-dev.62.0"
diff --git a/test/model_test.dart b/test/model_test.dart
index 94bfeb257f..eb638a7613 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -1213,7 +1213,7 @@ void main() {
     });
 
     test('SpecialList has many inherited methods', () {
-      expect(SpecialList.publicInheritedMethods, hasLength(50));
+      expect(SpecialList.publicInheritedMethods, hasLength(49));
       expect(SpecialList.publicInheritedMethods.first.name, equals('add'));
       expect(SpecialList.publicInheritedMethods.toList()[1].name,
           equals('addAll'));
diff --git a/testing/test_package_docs/fake/ExtraSpecialList-class.html b/testing/test_package_docs/fake/ExtraSpecialList-class.html
index 56e57625e8..9f13a7e790 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList-class.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList-class.html
@@ -585,15 +585,6 @@ <h2>Methods</h2>
         <dd class="inherited">
           
           <div class="features">inherited</div>
-</dd>
-        <dt id="retype" class="callable inherited">
-          <span class="name deprecated"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
-          </span>
-        </dt>
-        <dd class="inherited">
-          
-          <div class="features">@<a href="ex/Deprecated-class.html">Deprecated</a>(&#39;Use cast instead.&#39;), inherited</div>
 </dd>
         <dt id="setAll" class="callable inherited">
           <span class="name"><a href="fake/SpecialList/setAll.html">setAll</a></span><span class="signature">(<wbr><span class="parameter" id="setAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="setAll-param-iterable"><span class="type-annotation">Iterable</span> <span class="parameter-name">iterable</span></span>)
@@ -834,7 +825,6 @@ <h2>Operators</h2>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html b/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html
index b158597bcf..75cdff9ecb 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html
@@ -91,7 +91,6 @@ <h5>ExtraSpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList-class.html b/testing/test_package_docs/fake/SpecialList-class.html
index 2670df86fd..26b0231876 100644
--- a/testing/test_package_docs/fake/SpecialList-class.html
+++ b/testing/test_package_docs/fake/SpecialList-class.html
@@ -588,15 +588,6 @@ <h2>Methods</h2>
         <dd class="inherited">
           
           <div class="features">inherited</div>
-</dd>
-        <dt id="retype" class="callable inherited">
-          <span class="name deprecated"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr>)
-            <span class="returntype parameter">&#8594; List<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
-          </span>
-        </dt>
-        <dd class="inherited">
-          
-          <div class="features">@<a href="ex/Deprecated-class.html">Deprecated</a>(&#39;Use cast instead.&#39;), inherited</div>
 </dd>
         <dt id="setAll" class="callable inherited">
           <span class="name"><a href="fake/SpecialList/setAll.html">setAll</a></span><span class="signature">(<wbr><span class="parameter" id="setAll-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span>, </span> <span class="parameter" id="setAll-param-iterable"><span class="type-annotation">Iterable<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></span> <span class="parameter-name">iterable</span></span>)
@@ -837,7 +828,6 @@ <h2>Operators</h2>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/SpecialList.html b/testing/test_package_docs/fake/SpecialList/SpecialList.html
index 3cc7492889..ab2ffb360f 100644
--- a/testing/test_package_docs/fake/SpecialList/SpecialList.html
+++ b/testing/test_package_docs/fake/SpecialList/SpecialList.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/add.html b/testing/test_package_docs/fake/SpecialList/add.html
index cdd1c486fd..ff653b8fd2 100644
--- a/testing/test_package_docs/fake/SpecialList/add.html
+++ b/testing/test_package_docs/fake/SpecialList/add.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/addAll.html b/testing/test_package_docs/fake/SpecialList/addAll.html
index 0bfa3b0a97..e828612818 100644
--- a/testing/test_package_docs/fake/SpecialList/addAll.html
+++ b/testing/test_package_docs/fake/SpecialList/addAll.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/any.html b/testing/test_package_docs/fake/SpecialList/any.html
index e6caad1e3c..ec62ac1ad1 100644
--- a/testing/test_package_docs/fake/SpecialList/any.html
+++ b/testing/test_package_docs/fake/SpecialList/any.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/asMap.html b/testing/test_package_docs/fake/SpecialList/asMap.html
index 91635a3247..4c9b14d377 100644
--- a/testing/test_package_docs/fake/SpecialList/asMap.html
+++ b/testing/test_package_docs/fake/SpecialList/asMap.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/cast.html b/testing/test_package_docs/fake/SpecialList/cast.html
index f7675c7fd1..df39065719 100644
--- a/testing/test_package_docs/fake/SpecialList/cast.html
+++ b/testing/test_package_docs/fake/SpecialList/cast.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/clear.html b/testing/test_package_docs/fake/SpecialList/clear.html
index 4ad532e186..3834764625 100644
--- a/testing/test_package_docs/fake/SpecialList/clear.html
+++ b/testing/test_package_docs/fake/SpecialList/clear.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/contains.html b/testing/test_package_docs/fake/SpecialList/contains.html
index 406d9a5b02..042a33aedf 100644
--- a/testing/test_package_docs/fake/SpecialList/contains.html
+++ b/testing/test_package_docs/fake/SpecialList/contains.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/elementAt.html b/testing/test_package_docs/fake/SpecialList/elementAt.html
index fc53228e06..ec790f4374 100644
--- a/testing/test_package_docs/fake/SpecialList/elementAt.html
+++ b/testing/test_package_docs/fake/SpecialList/elementAt.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/every.html b/testing/test_package_docs/fake/SpecialList/every.html
index 6b28fbd80f..d04ca72711 100644
--- a/testing/test_package_docs/fake/SpecialList/every.html
+++ b/testing/test_package_docs/fake/SpecialList/every.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/expand.html b/testing/test_package_docs/fake/SpecialList/expand.html
index 0cfeb1e499..52d599f00d 100644
--- a/testing/test_package_docs/fake/SpecialList/expand.html
+++ b/testing/test_package_docs/fake/SpecialList/expand.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/fillRange.html b/testing/test_package_docs/fake/SpecialList/fillRange.html
index 7bc3691186..7ec210d9e0 100644
--- a/testing/test_package_docs/fake/SpecialList/fillRange.html
+++ b/testing/test_package_docs/fake/SpecialList/fillRange.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/first.html b/testing/test_package_docs/fake/SpecialList/first.html
index d2ad4cba77..c6ac916aba 100644
--- a/testing/test_package_docs/fake/SpecialList/first.html
+++ b/testing/test_package_docs/fake/SpecialList/first.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/firstWhere.html b/testing/test_package_docs/fake/SpecialList/firstWhere.html
index 1a63ff225b..2bc421fa33 100644
--- a/testing/test_package_docs/fake/SpecialList/firstWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/firstWhere.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/fold.html b/testing/test_package_docs/fake/SpecialList/fold.html
index f56bb3fad9..c8df368362 100644
--- a/testing/test_package_docs/fake/SpecialList/fold.html
+++ b/testing/test_package_docs/fake/SpecialList/fold.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/followedBy.html b/testing/test_package_docs/fake/SpecialList/followedBy.html
index 29c5fbb465..424f24ace0 100644
--- a/testing/test_package_docs/fake/SpecialList/followedBy.html
+++ b/testing/test_package_docs/fake/SpecialList/followedBy.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/forEach.html b/testing/test_package_docs/fake/SpecialList/forEach.html
index cd81b79f23..786c0a49f9 100644
--- a/testing/test_package_docs/fake/SpecialList/forEach.html
+++ b/testing/test_package_docs/fake/SpecialList/forEach.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/getRange.html b/testing/test_package_docs/fake/SpecialList/getRange.html
index eeef91503a..6ce3e98615 100644
--- a/testing/test_package_docs/fake/SpecialList/getRange.html
+++ b/testing/test_package_docs/fake/SpecialList/getRange.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/hashCode.html b/testing/test_package_docs/fake/SpecialList/hashCode.html
index a95eb97b3c..a889e73d35 100644
--- a/testing/test_package_docs/fake/SpecialList/hashCode.html
+++ b/testing/test_package_docs/fake/SpecialList/hashCode.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/indexOf.html b/testing/test_package_docs/fake/SpecialList/indexOf.html
index 137c4c784b..6c7bdefa36 100644
--- a/testing/test_package_docs/fake/SpecialList/indexOf.html
+++ b/testing/test_package_docs/fake/SpecialList/indexOf.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/indexWhere.html b/testing/test_package_docs/fake/SpecialList/indexWhere.html
index e0b3d0e1d6..1c211ffff1 100644
--- a/testing/test_package_docs/fake/SpecialList/indexWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/indexWhere.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/insert.html b/testing/test_package_docs/fake/SpecialList/insert.html
index 1759d27da9..383bb75080 100644
--- a/testing/test_package_docs/fake/SpecialList/insert.html
+++ b/testing/test_package_docs/fake/SpecialList/insert.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/insertAll.html b/testing/test_package_docs/fake/SpecialList/insertAll.html
index bf361dae46..b78d0467ec 100644
--- a/testing/test_package_docs/fake/SpecialList/insertAll.html
+++ b/testing/test_package_docs/fake/SpecialList/insertAll.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/isEmpty.html b/testing/test_package_docs/fake/SpecialList/isEmpty.html
index debf265363..98c0e08df2 100644
--- a/testing/test_package_docs/fake/SpecialList/isEmpty.html
+++ b/testing/test_package_docs/fake/SpecialList/isEmpty.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/isNotEmpty.html b/testing/test_package_docs/fake/SpecialList/isNotEmpty.html
index c36a7206ad..1ff360a025 100644
--- a/testing/test_package_docs/fake/SpecialList/isNotEmpty.html
+++ b/testing/test_package_docs/fake/SpecialList/isNotEmpty.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/iterator.html b/testing/test_package_docs/fake/SpecialList/iterator.html
index 6cb21a624a..705dc79084 100644
--- a/testing/test_package_docs/fake/SpecialList/iterator.html
+++ b/testing/test_package_docs/fake/SpecialList/iterator.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/join.html b/testing/test_package_docs/fake/SpecialList/join.html
index 46acbd9156..a588fda5af 100644
--- a/testing/test_package_docs/fake/SpecialList/join.html
+++ b/testing/test_package_docs/fake/SpecialList/join.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/last.html b/testing/test_package_docs/fake/SpecialList/last.html
index bb50ca894a..2993787352 100644
--- a/testing/test_package_docs/fake/SpecialList/last.html
+++ b/testing/test_package_docs/fake/SpecialList/last.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/lastIndexOf.html b/testing/test_package_docs/fake/SpecialList/lastIndexOf.html
index 98b444e21d..f55bce259f 100644
--- a/testing/test_package_docs/fake/SpecialList/lastIndexOf.html
+++ b/testing/test_package_docs/fake/SpecialList/lastIndexOf.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/lastIndexWhere.html b/testing/test_package_docs/fake/SpecialList/lastIndexWhere.html
index 365cad49bb..8886fc7618 100644
--- a/testing/test_package_docs/fake/SpecialList/lastIndexWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/lastIndexWhere.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/lastWhere.html b/testing/test_package_docs/fake/SpecialList/lastWhere.html
index d76b9a091b..1be23480fa 100644
--- a/testing/test_package_docs/fake/SpecialList/lastWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/lastWhere.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/length.html b/testing/test_package_docs/fake/SpecialList/length.html
index f7c18c6942..d2d3af7366 100644
--- a/testing/test_package_docs/fake/SpecialList/length.html
+++ b/testing/test_package_docs/fake/SpecialList/length.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/map.html b/testing/test_package_docs/fake/SpecialList/map.html
index eda2ed0936..6bb2ee772c 100644
--- a/testing/test_package_docs/fake/SpecialList/map.html
+++ b/testing/test_package_docs/fake/SpecialList/map.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/noSuchMethod.html b/testing/test_package_docs/fake/SpecialList/noSuchMethod.html
index d48b7393be..942f4ad2fa 100644
--- a/testing/test_package_docs/fake/SpecialList/noSuchMethod.html
+++ b/testing/test_package_docs/fake/SpecialList/noSuchMethod.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/operator_equals.html b/testing/test_package_docs/fake/SpecialList/operator_equals.html
index 6e021e8f76..db0d71c4d4 100644
--- a/testing/test_package_docs/fake/SpecialList/operator_equals.html
+++ b/testing/test_package_docs/fake/SpecialList/operator_equals.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/operator_get.html b/testing/test_package_docs/fake/SpecialList/operator_get.html
index dc727376c5..8b4fa53501 100644
--- a/testing/test_package_docs/fake/SpecialList/operator_get.html
+++ b/testing/test_package_docs/fake/SpecialList/operator_get.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/operator_plus.html b/testing/test_package_docs/fake/SpecialList/operator_plus.html
index a11dad0771..09b1e738e2 100644
--- a/testing/test_package_docs/fake/SpecialList/operator_plus.html
+++ b/testing/test_package_docs/fake/SpecialList/operator_plus.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/operator_put.html b/testing/test_package_docs/fake/SpecialList/operator_put.html
index 997e59514c..c95c15559e 100644
--- a/testing/test_package_docs/fake/SpecialList/operator_put.html
+++ b/testing/test_package_docs/fake/SpecialList/operator_put.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/reduce.html b/testing/test_package_docs/fake/SpecialList/reduce.html
index d154e344af..f0cec58ac0 100644
--- a/testing/test_package_docs/fake/SpecialList/reduce.html
+++ b/testing/test_package_docs/fake/SpecialList/reduce.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/remove.html b/testing/test_package_docs/fake/SpecialList/remove.html
index 162b4dbf5d..67d11067ce 100644
--- a/testing/test_package_docs/fake/SpecialList/remove.html
+++ b/testing/test_package_docs/fake/SpecialList/remove.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/removeAt.html b/testing/test_package_docs/fake/SpecialList/removeAt.html
index 13b5b45dc8..d730c1b8b1 100644
--- a/testing/test_package_docs/fake/SpecialList/removeAt.html
+++ b/testing/test_package_docs/fake/SpecialList/removeAt.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/removeLast.html b/testing/test_package_docs/fake/SpecialList/removeLast.html
index fbc35ca914..27ea3cf0fb 100644
--- a/testing/test_package_docs/fake/SpecialList/removeLast.html
+++ b/testing/test_package_docs/fake/SpecialList/removeLast.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/removeRange.html b/testing/test_package_docs/fake/SpecialList/removeRange.html
index 667b94531a..65c123d14f 100644
--- a/testing/test_package_docs/fake/SpecialList/removeRange.html
+++ b/testing/test_package_docs/fake/SpecialList/removeRange.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/removeWhere.html b/testing/test_package_docs/fake/SpecialList/removeWhere.html
index a094515ad7..e9f3c5d9c2 100644
--- a/testing/test_package_docs/fake/SpecialList/removeWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/removeWhere.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/replaceRange.html b/testing/test_package_docs/fake/SpecialList/replaceRange.html
index a33f09f2d1..0b0b1e208b 100644
--- a/testing/test_package_docs/fake/SpecialList/replaceRange.html
+++ b/testing/test_package_docs/fake/SpecialList/replaceRange.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/retainWhere.html b/testing/test_package_docs/fake/SpecialList/retainWhere.html
index d52070b141..366933a522 100644
--- a/testing/test_package_docs/fake/SpecialList/retainWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/retainWhere.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/retype.html b/testing/test_package_docs/fake/SpecialList/retype.html
deleted file mode 100644
index 01174f028f..0000000000
--- a/testing/test_package_docs/fake/SpecialList/retype.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="description" content="API docs for the retype method from the SpecialList class, for the Dart programming language.">
-  <title>retype method - SpecialList class - fake library - Dart API</title>
-  <!-- required because all the links are pseudo-absolute -->
-  <base href="../..">
-
-  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
-  <link rel="stylesheet" href="static-assets/github.css">
-  <link rel="stylesheet" href="static-assets/styles.css">
-  <link rel="icon" href="static-assets/favicon.png">
-
-</head>
-
-<body>
-
-<div id="overlay-under-drawer"></div>
-
-<header id="title">
-  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
-  <ol class="breadcrumbs gt-separated dark hidden-xs">
-    <li><a href="index.html">test_package</a></li>
-    <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></a></li>
-    <li class="self-crumb"><span class="deprecated">retype&lt;<wbr><span class="type-parameter">R</span>&gt;</span> method</li>
-  </ol>
-  <div class="self-name">retype</div>
-  <form class="search navbar-right" role="search">
-    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
-  </form>
-</header>
-
-<main>
-
-  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
-    <h5>SpecialList class</h5>
-    <ol>
-      <li class="section-title"><a href="fake/SpecialList-class.html#constructors">Constructors</a></li>
-      <li><a href="fake/SpecialList/SpecialList.html">SpecialList</a></li>
-    
-      <li class="section-title">
-        <a href="fake/SpecialList-class.html#instance-properties">Properties</a>
-      </li>
-      <li><a href="fake/SpecialList/length.html">length</a></li>
-      <li class="inherited"><a href="fake/SpecialList/first.html">first</a></li>
-      <li class="inherited"><a href="fake/SpecialList/hashCode.html">hashCode</a></li>
-      <li class="inherited"><a href="fake/SpecialList/isEmpty.html">isEmpty</a></li>
-      <li class="inherited"><a href="fake/SpecialList/isNotEmpty.html">isNotEmpty</a></li>
-      <li class="inherited"><a href="fake/SpecialList/iterator.html">iterator</a></li>
-      <li class="inherited"><a href="fake/SpecialList/last.html">last</a></li>
-      <li class="inherited"><a href="fake/SpecialList/reversed.html">reversed</a></li>
-      <li class="inherited"><a href="fake/SpecialList/runtimeType.html">runtimeType</a></li>
-      <li class="inherited"><a href="fake/SpecialList/single.html">single</a></li>
-    
-      <li class="section-title inherited"><a href="fake/SpecialList-class.html#instance-methods">Methods</a></li>
-      <li class="inherited"><a href="fake/SpecialList/add.html">add</a></li>
-      <li class="inherited"><a href="fake/SpecialList/addAll.html">addAll</a></li>
-      <li class="inherited"><a href="fake/SpecialList/any.html">any</a></li>
-      <li class="inherited"><a href="fake/SpecialList/asMap.html">asMap</a></li>
-      <li class="inherited"><a href="fake/SpecialList/cast.html">cast</a></li>
-      <li class="inherited"><a href="fake/SpecialList/clear.html">clear</a></li>
-      <li class="inherited"><a href="fake/SpecialList/contains.html">contains</a></li>
-      <li class="inherited"><a href="fake/SpecialList/elementAt.html">elementAt</a></li>
-      <li class="inherited"><a href="fake/SpecialList/every.html">every</a></li>
-      <li class="inherited"><a href="fake/SpecialList/expand.html">expand</a></li>
-      <li class="inherited"><a href="fake/SpecialList/fillRange.html">fillRange</a></li>
-      <li class="inherited"><a href="fake/SpecialList/firstWhere.html">firstWhere</a></li>
-      <li class="inherited"><a href="fake/SpecialList/fold.html">fold</a></li>
-      <li class="inherited"><a href="fake/SpecialList/followedBy.html">followedBy</a></li>
-      <li class="inherited"><a href="fake/SpecialList/forEach.html">forEach</a></li>
-      <li class="inherited"><a href="fake/SpecialList/getRange.html">getRange</a></li>
-      <li class="inherited"><a href="fake/SpecialList/indexOf.html">indexOf</a></li>
-      <li class="inherited"><a href="fake/SpecialList/indexWhere.html">indexWhere</a></li>
-      <li class="inherited"><a href="fake/SpecialList/insert.html">insert</a></li>
-      <li class="inherited"><a href="fake/SpecialList/insertAll.html">insertAll</a></li>
-      <li class="inherited"><a href="fake/SpecialList/join.html">join</a></li>
-      <li class="inherited"><a href="fake/SpecialList/lastIndexOf.html">lastIndexOf</a></li>
-      <li class="inherited"><a href="fake/SpecialList/lastIndexWhere.html">lastIndexWhere</a></li>
-      <li class="inherited"><a href="fake/SpecialList/lastWhere.html">lastWhere</a></li>
-      <li class="inherited"><a href="fake/SpecialList/map.html">map</a></li>
-      <li class="inherited"><a href="fake/SpecialList/noSuchMethod.html">noSuchMethod</a></li>
-      <li class="inherited"><a href="fake/SpecialList/reduce.html">reduce</a></li>
-      <li class="inherited"><a href="fake/SpecialList/remove.html">remove</a></li>
-      <li class="inherited"><a href="fake/SpecialList/removeAt.html">removeAt</a></li>
-      <li class="inherited"><a href="fake/SpecialList/removeLast.html">removeLast</a></li>
-      <li class="inherited"><a href="fake/SpecialList/removeRange.html">removeRange</a></li>
-      <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
-      <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
-      <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
-      <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
-      <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
-      <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
-      <li class="inherited"><a href="fake/SpecialList/singleWhere.html">singleWhere</a></li>
-      <li class="inherited"><a href="fake/SpecialList/skip.html">skip</a></li>
-      <li class="inherited"><a href="fake/SpecialList/skipWhile.html">skipWhile</a></li>
-      <li class="inherited"><a href="fake/SpecialList/sort.html">sort</a></li>
-      <li class="inherited"><a href="fake/SpecialList/sublist.html">sublist</a></li>
-      <li class="inherited"><a href="fake/SpecialList/take.html">take</a></li>
-      <li class="inherited"><a href="fake/SpecialList/takeWhile.html">takeWhile</a></li>
-      <li class="inherited"><a href="fake/SpecialList/toList.html">toList</a></li>
-      <li class="inherited"><a href="fake/SpecialList/toSet.html">toSet</a></li>
-      <li class="inherited"><a href="fake/SpecialList/toString.html">toString</a></li>
-      <li class="inherited"><a href="fake/SpecialList/where.html">where</a></li>
-      <li class="inherited"><a href="fake/SpecialList/whereType.html">whereType</a></li>
-    
-      <li class="section-title"><a href="fake/SpecialList-class.html#operators">Operators</a></li>
-      <li><a href="fake/SpecialList/operator_get.html">operator []</a></li>
-      <li><a href="fake/SpecialList/operator_put.html">operator []=</a></li>
-      <li class="inherited"><a href="fake/SpecialList/operator_plus.html">operator +</a></li>
-      <li class="inherited"><a href="fake/SpecialList/operator_equals.html">operator ==</a></li>
-    
-    
-    
-    </ol>
-  </div><!--/.sidebar-offcanvas-->
-
-  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>retype&lt;<wbr><span class="type-parameter">R</span>&gt; method</h1>
-
-    <section class="multi-line-signature">
-      <div>
-        <ol class="annotation-list">
-          <li>@<a href="ex/Deprecated-class.html">Deprecated</a>(&#39;Use cast instead.&#39;)</li>
-        </ol>
-      </div>
-      <span class="returntype">List<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
-      <span class="name deprecated">retype</span>
-&lt;<wbr><span class="type-parameter">R</span>&gt;(<wbr>)
-    </section>
-    
-    
-
-  </div> <!-- /.main-content -->
-
-  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
-  </div><!--/.sidebar-offcanvas-->
-
-</main>
-
-<footer>
-  <span class="no-break">
-    test_package 0.0.1
-  </span>
-
-</footer>
-
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-<script src="static-assets/typeahead.bundle.min.js"></script>
-<script src="static-assets/highlight.pack.js"></script>
-<script src="static-assets/URI.js"></script>
-<script src="static-assets/script.js"></script>
-
-
-</body>
-
-</html>
diff --git a/testing/test_package_docs/fake/SpecialList/reversed.html b/testing/test_package_docs/fake/SpecialList/reversed.html
index ca6303a405..888fc2d451 100644
--- a/testing/test_package_docs/fake/SpecialList/reversed.html
+++ b/testing/test_package_docs/fake/SpecialList/reversed.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/runtimeType.html b/testing/test_package_docs/fake/SpecialList/runtimeType.html
index 9a361ca5ab..1e74e75390 100644
--- a/testing/test_package_docs/fake/SpecialList/runtimeType.html
+++ b/testing/test_package_docs/fake/SpecialList/runtimeType.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/setAll.html b/testing/test_package_docs/fake/SpecialList/setAll.html
index ef9d87a647..dbeb2c800b 100644
--- a/testing/test_package_docs/fake/SpecialList/setAll.html
+++ b/testing/test_package_docs/fake/SpecialList/setAll.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/setRange.html b/testing/test_package_docs/fake/SpecialList/setRange.html
index 1ee1afceba..3d25e3cb70 100644
--- a/testing/test_package_docs/fake/SpecialList/setRange.html
+++ b/testing/test_package_docs/fake/SpecialList/setRange.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/shuffle.html b/testing/test_package_docs/fake/SpecialList/shuffle.html
index d3109c238e..bbcbe01060 100644
--- a/testing/test_package_docs/fake/SpecialList/shuffle.html
+++ b/testing/test_package_docs/fake/SpecialList/shuffle.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/single.html b/testing/test_package_docs/fake/SpecialList/single.html
index d9373d87ed..3d73849166 100644
--- a/testing/test_package_docs/fake/SpecialList/single.html
+++ b/testing/test_package_docs/fake/SpecialList/single.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/singleWhere.html b/testing/test_package_docs/fake/SpecialList/singleWhere.html
index bdfcfd9a31..701925e997 100644
--- a/testing/test_package_docs/fake/SpecialList/singleWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/singleWhere.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/skip.html b/testing/test_package_docs/fake/SpecialList/skip.html
index 53ed03fae9..84281725d8 100644
--- a/testing/test_package_docs/fake/SpecialList/skip.html
+++ b/testing/test_package_docs/fake/SpecialList/skip.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/skipWhile.html b/testing/test_package_docs/fake/SpecialList/skipWhile.html
index 3fe8bccc17..be65361d2e 100644
--- a/testing/test_package_docs/fake/SpecialList/skipWhile.html
+++ b/testing/test_package_docs/fake/SpecialList/skipWhile.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/sort.html b/testing/test_package_docs/fake/SpecialList/sort.html
index 4b00ea2214..7413956adc 100644
--- a/testing/test_package_docs/fake/SpecialList/sort.html
+++ b/testing/test_package_docs/fake/SpecialList/sort.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/sublist.html b/testing/test_package_docs/fake/SpecialList/sublist.html
index f232c3988c..4760bd40be 100644
--- a/testing/test_package_docs/fake/SpecialList/sublist.html
+++ b/testing/test_package_docs/fake/SpecialList/sublist.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/take.html b/testing/test_package_docs/fake/SpecialList/take.html
index 7b3bd5b4e7..0e68c73daf 100644
--- a/testing/test_package_docs/fake/SpecialList/take.html
+++ b/testing/test_package_docs/fake/SpecialList/take.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/takeWhile.html b/testing/test_package_docs/fake/SpecialList/takeWhile.html
index 4229d78f68..b3e85fcaf5 100644
--- a/testing/test_package_docs/fake/SpecialList/takeWhile.html
+++ b/testing/test_package_docs/fake/SpecialList/takeWhile.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/toList.html b/testing/test_package_docs/fake/SpecialList/toList.html
index 00b24c064d..eb1ed8e36d 100644
--- a/testing/test_package_docs/fake/SpecialList/toList.html
+++ b/testing/test_package_docs/fake/SpecialList/toList.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/toSet.html b/testing/test_package_docs/fake/SpecialList/toSet.html
index 52a4319196..1ba537d29a 100644
--- a/testing/test_package_docs/fake/SpecialList/toSet.html
+++ b/testing/test_package_docs/fake/SpecialList/toSet.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/toString.html b/testing/test_package_docs/fake/SpecialList/toString.html
index 45e22fb14b..bccfef4ea9 100644
--- a/testing/test_package_docs/fake/SpecialList/toString.html
+++ b/testing/test_package_docs/fake/SpecialList/toString.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/where.html b/testing/test_package_docs/fake/SpecialList/where.html
index ee181ad0ca..f1cd98b334 100644
--- a/testing/test_package_docs/fake/SpecialList/where.html
+++ b/testing/test_package_docs/fake/SpecialList/where.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/whereType.html b/testing/test_package_docs/fake/SpecialList/whereType.html
index b08bad8da1..a8722d1fce 100644
--- a/testing/test_package_docs/fake/SpecialList/whereType.html
+++ b/testing/test_package_docs/fake/SpecialList/whereType.html
@@ -91,7 +91,6 @@ <h5>SpecialList class</h5>
       <li class="inherited"><a href="fake/SpecialList/removeWhere.html">removeWhere</a></li>
       <li class="inherited"><a href="fake/SpecialList/replaceRange.html">replaceRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/retainWhere.html">retainWhere</a></li>
-      <li class="inherited"><a class="deprecated" href="fake/SpecialList/retype.html">retype</a></li>
       <li class="inherited"><a href="fake/SpecialList/setAll.html">setAll</a></li>
       <li class="inherited"><a href="fake/SpecialList/setRange.html">setRange</a></li>
       <li class="inherited"><a href="fake/SpecialList/shuffle.html">shuffle</a></li>
diff --git a/testing/test_package_docs/index.json b/testing/test_package_docs/index.json
index cff3e09bef..25431f763c 100644
--- a/testing/test_package_docs/index.json
+++ b/testing/test_package_docs/index.json
@@ -7664,17 +7664,6 @@
    "type": "class"
   }
  },
- {
-  "name": "retype",
-  "qualifiedName": "fake.SpecialList.retype",
-  "href": "fake/SpecialList/retype.html",
-  "type": "method",
-  "overriddenDepth": 2,
-  "enclosedBy": {
-   "name": "SpecialList",
-   "type": "class"
-  }
- },
  {
   "name": "reversed",
   "qualifiedName": "fake.SpecialList.reversed",

From 63f39b7918a0b40d58989e46f236f83c2865e8bc Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 13 Jun 2018 13:29:32 -0700
Subject: [PATCH 3/6] Improve error message when FLUTTER_ROOT is needed but not
 set

---
 lib/src/dartdoc_options.dart | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/src/dartdoc_options.dart b/lib/src/dartdoc_options.dart
index 4edc9ebeb9..e0211db51c 100644
--- a/lib/src/dartdoc_options.dart
+++ b/lib/src/dartdoc_options.dart
@@ -1120,8 +1120,12 @@ Future<List<DartdocOption>> createDartdocOptions() async {
       if (!option.parent['sdkDocs'].valueAt(dir) &&
           (option.root['topLevelPackageMeta'].valueAt(dir) as PackageMeta)
               .requiresFlutter) {
-        return pathLib.join(option.root['flutterRoot'].valueAt(dir), 'bin',
-            'cache', 'dart-sdk');
+        String flutterRoot = option.root['flutterRoot'].valueAt(dir);
+        if (flutterRoot == null) {
+          throw new DartdocOptionError(
+              'Top level package requires Flutter but FLUTTER_ROOT environment variable not set');
+        }
+        return pathLib.join(flutterRoot, 'bin', 'cache', 'dart-sdk');
       }
       return defaultSdkDir.absolute.path;
     }, help: 'Path to the SDK directory.', isDir: true, mustExist: true),

From 94dba3e4c0e340ad0aefb9dc98e0e64a1056855c Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 13 Jun 2018 14:38:49 -0700
Subject: [PATCH 4/6] Add a test for the new exception

---
 lib/src/dartdoc_options.dart  | 13 ++++++-------
 test/compare_output_test.dart | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/lib/src/dartdoc_options.dart b/lib/src/dartdoc_options.dart
index e0211db51c..fcd9dba42f 100644
--- a/lib/src/dartdoc_options.dart
+++ b/lib/src/dartdoc_options.dart
@@ -1022,13 +1022,12 @@ Future<List<DartdocOption>> createDartdocOptions() async {
     // This could be a ArgOnly, but trying to not provide too many ways
     // to set the flutter root.
     new DartdocOptionSyntheticOnly<String>(
-      'flutterRoot',
-      (DartdocSyntheticOption<String> option, Directory dir) =>
-          resolveTildePath(Platform.environment['FLUTTER_ROOT']),
-      isDir: true,
-      help: 'Root of the Flutter SDK, specified from environment.',
-      mustExist: true,
-    ),
+        'flutterRoot',
+        (DartdocSyntheticOption<String> option, Directory dir) =>
+            resolveTildePath(Platform.environment['FLUTTER_ROOT']),
+        isDir: true,
+        help: 'Root of the Flutter SDK, specified from environment.',
+        mustExist: true),
     new DartdocOptionArgOnly<bool>('hideSdkText', false,
         hide: true,
         help:
diff --git a/test/compare_output_test.dart b/test/compare_output_test.dart
index a85d7e9874..db2f456ee4 100644
--- a/test/compare_output_test.dart
+++ b/test/compare_output_test.dart
@@ -27,6 +27,9 @@ String get _testPackageDocsPath =>
 String get _testPackagePath =>
     pathLib.fromUri(_currentFileUri.resolve('../testing/test_package'));
 
+String get _testPackageFlutterPluginPath => pathLib
+    .fromUri(_currentFileUri.resolve('../testing/test_package_flutter_plugin'));
+
 void main() {
   group('compare outputs', () {
     Directory tempDir;
@@ -44,6 +47,18 @@ void main() {
       }
     });
 
+    test('Validate missing FLUTTER_ROOT exception is clean', () async {
+      var args = <String>[dartdocBin];
+      var result = Process.runSync(Platform.resolvedExecutable, args,
+          workingDirectory: _testPackageFlutterPluginPath);
+      expect(
+          result.stderr,
+          contains(
+              'Top level package requires Flutter but FLUTTER_ROOT environment variable not set'));
+      expect(result.stderr, isNot(contains('asynchronous gap')));
+      expect(result.exitCode, isNot(0));
+    });
+
     test("Validate --version works", () async {
       var args = <String>[dartdocBin, '--version'];
       var result = Process.runSync(Platform.resolvedExecutable, args,

From 24dcb905f97a50146f00bdd5beeca933d1c9ca2d Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Wed, 13 Jun 2018 14:42:49 -0700
Subject: [PATCH 5/6] Make the test work even when FLUTTER_ROOT is already in
 the environemnt

---
 test/compare_output_test.dart | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/compare_output_test.dart b/test/compare_output_test.dart
index db2f456ee4..13d482b342 100644
--- a/test/compare_output_test.dart
+++ b/test/compare_output_test.dart
@@ -50,6 +50,9 @@ void main() {
     test('Validate missing FLUTTER_ROOT exception is clean', () async {
       var args = <String>[dartdocBin];
       var result = Process.runSync(Platform.resolvedExecutable, args,
+          environment: new Map.from(Platform.environment)
+            ..remove('FLUTTER_ROOT'),
+          includeParentEnvironment: false,
           workingDirectory: _testPackageFlutterPluginPath);
       expect(
           result.stderr,

From c9b80ea2a52381302d6115bbfe9e3095448e97b9 Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Thu, 14 Jun 2018 11:25:18 -0700
Subject: [PATCH 6/6] Allow the pub warning as well, since if pub get hasn't
 been run yet that's the error users will see

---
 test/compare_output_test.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/compare_output_test.dart b/test/compare_output_test.dart
index 13d482b342..3fcb718828 100644
--- a/test/compare_output_test.dart
+++ b/test/compare_output_test.dart
@@ -56,8 +56,8 @@ void main() {
           workingDirectory: _testPackageFlutterPluginPath);
       expect(
           result.stderr,
-          contains(
-              'Top level package requires Flutter but FLUTTER_ROOT environment variable not set'));
+          contains(new RegExp(
+              'Top level package requires Flutter but FLUTTER_ROOT environment variable not set|test_package_flutter_plugin requires the Flutter SDK, version solving failed')));
       expect(result.stderr, isNot(contains('asynchronous gap')));
       expect(result.exitCode, isNot(0));
     });