From 8cc43aebcba82fefb2d47dc189adb8fd34f05be3 Mon Sep 17 00:00:00 2001
From: Devon Carew <devoncarew@google.com>
Date: Mon, 18 Apr 2022 22:17:50 +0000
Subject: [PATCH] Move runtime/tools/dartfuzz to package:lints.

Change-Id: I55cb7c3a832879202d9be225dcfdce3a12e25487
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/241149
Reviewed-by: Siva Annamalai <asiva@google.com>
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Devon Carew <devoncarew@google.com>
---
 runtime/tools/dartfuzz/analysis_options.yaml |  2 +-
 runtime/tools/dartfuzz/dartfuzz.dart         |  2 --
 runtime/tools/dartfuzz/gen_api_table.dart    |  2 +-
 runtime/tools/dartfuzz/gen_type_table.dart   |  2 +-
 runtime/tools/dartfuzz/pubspec.yaml          | 10 ++++++++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/runtime/tools/dartfuzz/analysis_options.yaml b/runtime/tools/dartfuzz/analysis_options.yaml
index 73dd727d6ec..382a641fdfa 100644
--- a/runtime/tools/dartfuzz/analysis_options.yaml
+++ b/runtime/tools/dartfuzz/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:pedantic/analysis_options.yaml
+include: package:lints/core.yaml
 
 linter:
   rules:
diff --git a/runtime/tools/dartfuzz/dartfuzz.dart b/runtime/tools/dartfuzz/dartfuzz.dart
index a62e2359025..7326e202d2d 100644
--- a/runtime/tools/dartfuzz/dartfuzz.dart
+++ b/runtime/tools/dartfuzz/dartfuzz.dart
@@ -1938,11 +1938,9 @@ class DartFuzz {
     switch (choose(2)) {
       case 0:
         return emitScalarVar(tp, isLhs: isLhs, rhsFilter: rhsFilter);
-        break;
       default:
         return emitSubscriptedVar(depth, tp,
             isLhs: isLhs, assignOp: assignOp, rhsFilter: rhsFilter);
-        break;
     }
   }
 
diff --git a/runtime/tools/dartfuzz/gen_api_table.dart b/runtime/tools/dartfuzz/gen_api_table.dart
index 784dfcbe809..c7f55a0463a 100644
--- a/runtime/tools/dartfuzz/gen_api_table.dart
+++ b/runtime/tools/dartfuzz/gen_api_table.dart
@@ -15,8 +15,8 @@
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/analysis/session.dart';
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
+import 'package:analyzer/dart/element/type.dart';
 
 import 'gen_util.dart';
 
diff --git a/runtime/tools/dartfuzz/gen_type_table.dart b/runtime/tools/dartfuzz/gen_type_table.dart
index da29e5641d6..31fd62dbfad 100644
--- a/runtime/tools/dartfuzz/gen_type_table.dart
+++ b/runtime/tools/dartfuzz/gen_type_table.dart
@@ -1454,7 +1454,7 @@ void main(List<String> arguments) async {
             'therefore types with higher nesting '
             'depth are partially filtered.',
         defaultsTo: '1');
-  var results;
+  ArgResults results;
   try {
     results = parser.parse(arguments);
   } catch (e) {
diff --git a/runtime/tools/dartfuzz/pubspec.yaml b/runtime/tools/dartfuzz/pubspec.yaml
index 1e5277e3cfb..e3eab9a77e3 100644
--- a/runtime/tools/dartfuzz/pubspec.yaml
+++ b/runtime/tools/dartfuzz/pubspec.yaml
@@ -1,7 +1,13 @@
 name: dartfuzz
+# This package is not intended for consumption on pub.dev. DO NOT publish.
+publish_to: none
 
 environment:
-  sdk: '>=2.2.2 <3.0.0'
+  sdk: '>=2.10.0 <3.0.0'
+
+dependencies:
+  analyzer: any
+  args: any
 
 dev_dependencies:
-  pedantic: 'any'
+  lints: any