specify types | add Consumer typedef

ra1u · Jul 14, 2021 · c622322 · c622322
1 parent cb680f9
commit c622322
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/lib/connection.dart b/lib/connection.dart
@@ -71,8 +71,8 @@ class RedisConnection {
   }
 
   // ignore: unused_element
-  Future _sendraw(List data) {
-    _socket!.add(data as List<int>);
+  Future _sendraw(List<int> data) {
+    _socket!.add(data);
     return _senddummy();
   }
 

diff --git a/lib/redis.dart b/lib/redis.dart
@@ -15,6 +15,8 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:collection';
 
+import 'dart:typed_data';
+
 part './redisserialise.dart';
 part './connection.dart';
 part './lazystream.dart';

diff --git a/lib/redisserialise.dart b/lib/redisserialise.dart
@@ -19,6 +19,8 @@ class RedisBulk {
   RedisBulk(this.iterable) {}
 }
 
+typedef Consumer = void Function(Iterable<int> s);
+
 class RedisSerialise {
   static final ASCII = const AsciiCodec();
   static final UTF8 = const Utf8Codec();
@@ -28,15 +30,13 @@ class RedisSerialise {
   static final _linesep = ASCII.encode("\r\n");
   static final _dollarminus1 = ASCII.encode("\$-1");
 
-  static List<int> Serialise(object) {
-    var s = <int>[];
-    SerialiseConsumable(object, (v) {
-      s.addAll(v as Iterable<int>);
-    });
+  static List<int> Serialise(Object? object) {
+    final s = <int>[];
+    SerialiseConsumable(object, (v) => s.addAll(v));
     return s;
   }
 
-  static void SerialiseConsumable(object, void consumer(Iterable s)) {
+  static void SerialiseConsumable(Object? object, Consumer consumer) {
     if (object is String) {
       var data = UTF8.encode(object);
       consumer(_dollar);