commit 93a0b3843fd9bb6922cc09ba92904766cf307ed0
author srawlins <srawlins@google.com> Wed Mar 18 13:56:56 2020 -0400
committer Sam Rawlins <sam.rawlins@gmail.com> Mon Apr 27 15:35:03 2020 -0700
tree 8d15b21443f6e5c8d153d7d88aded3a75022b18a
parent c025c5eb23dc89c01363136ae107c30d032d9c63

Lints - pull https://github.com/dart-lang/mockito/pull/243 by @kevmoo into google3

PiperOrigin-RevId: 301623462

analysis_options.yaml

diff --git a/analysis_options.yaml b/analysis_options.yaml
index 928ef97..2cdc67b 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,31 +1,19 @@
 include: package:pedantic/analysis_options.yaml
+analyzer:
+  strong-mode:
+    implicit-casts: false
+
 linter:
   rules:
      # Errors
-     - avoid_empty_else
      - comment_references
      - control_flow_in_finally
      - empty_statements
      - hash_and_equals
      - test_types_in_equals
      - throw_in_finally
-     - unrelated_type_equality_checks
-     - valid_regexps
 
      # Style
-     - annotate_overrides
-     - avoid_init_to_null
-     - avoid_return_types_on_setters
      - await_only_futures
      - camel_case_types
-     - empty_catches
-     - empty_constructor_bodies
-     - library_names
-     - library_prefixes
      - non_constant_identifier_names
-     - prefer_generic_function_type_aliases
-     - prefer_is_not_empty
-     - slash_for_doc_comments
-     - type_init_formals
-     - unnecessary_const
-     - unnecessary_new

lib/src/builder.dart

diff --git a/lib/src/builder.dart b/lib/src/builder.dart
index 0a16320..23edeb1 100644
--- a/lib/src/builder.dart
+++ b/lib/src/builder.dart
@@ -441,7 +441,7 @@
           ..types.addAll(type.typeArguments.map(_typeReference));
       });
     } else if (type is analyzer.FunctionType) {
-      GenericFunctionTypeElement element = type.element;
+      var element = type.element;
       if (element == null) {
         // [type] represents a FunctionTypedFormalParameter.
         return FunctionType((b) {

test/nnbd_support_test.dart

diff --git a/test/nnbd_support_test.dart b/test/nnbd_support_test.dart
index 91f2639..faf0898 100644
--- a/test/nnbd_support_test.dart
+++ b/test/nnbd_support_test.dart
@@ -27,7 +27,7 @@
   @override
   String /*!*/ returnsNonNullableString() {
     return super.noSuchMethod(
-        Invocation.method(#returnsNonNullableString, []), 'Dummy');
+        Invocation.method(#returnsNonNullableString, []), 'Dummy') as String;
   }
 }