Skip to content

Commit ca11562

Browse files
committed
enable and fix a number of lints
1 parent 6518c8a commit ca11562

File tree

5 files changed

+63
-18
lines changed

5 files changed

+63
-18
lines changed

analysis_options.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
include: package:pedantic/analysis_options.yaml
2+
analyzer:
3+
strong-mode:
4+
implicit-casts: false
5+
linter:
6+
rules:
7+
- avoid_empty_else
8+
- avoid_init_to_null
9+
- avoid_null_checks_in_equality_operators
10+
- avoid_unused_constructor_parameters
11+
- await_only_futures
12+
- camel_case_types
13+
- cancel_subscriptions
14+
- constant_identifier_names
15+
- control_flow_in_finally
16+
- directives_ordering
17+
- empty_catches
18+
- empty_constructor_bodies
19+
- empty_statements
20+
- hash_and_equals
21+
- implementation_imports
22+
- iterable_contains_unrelated_type
23+
- library_names
24+
- library_prefixes
25+
- list_remove_unrelated_type
26+
- non_constant_identifier_names
27+
- overridden_fields
28+
- package_api_docs
29+
- package_names
30+
- package_prefixed_library_names
31+
- prefer_equal_for_default_values
32+
- prefer_final_fields
33+
- prefer_generic_function_type_aliases
34+
- prefer_is_not_empty
35+
- slash_for_doc_comments
36+
- super_goes_last
37+
- test_types_in_equals
38+
- throw_in_finally
39+
- type_init_formals
40+
- unnecessary_brace_in_string_interps
41+
- unnecessary_const
42+
- unnecessary_new
43+
- unrelated_type_equality_checks
44+
- valid_regexps

lib/http_multi_server.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class HttpMultiServer extends StreamView<HttpRequest> implements HttpServer {
8686
/// listened to when this is called.
8787
HttpMultiServer(Iterable<HttpServer> servers)
8888
: _servers = servers.toSet(),
89-
defaultResponseHeaders = new MultiHeaders(
89+
defaultResponseHeaders = MultiHeaders(
9090
servers.map((server) => server.defaultResponseHeaders)),
9191
super(StreamGroup.merge(servers));
9292

@@ -95,7 +95,7 @@ class HttpMultiServer extends StreamView<HttpRequest> implements HttpServer {
9595
///
9696
/// See [HttpServer.bind].
9797
static Future<HttpServer> loopback(int port,
98-
{int backlog, bool v6Only: false, bool shared: false}) {
98+
{int backlog, bool v6Only = false, bool shared = false}) {
9999
if (backlog == null) backlog = 0;
100100

101101
return _loopback(
@@ -109,9 +109,9 @@ class HttpMultiServer extends StreamView<HttpRequest> implements HttpServer {
109109
/// See [HttpServer.bindSecure].
110110
static Future<HttpServer> loopbackSecure(int port, SecurityContext context,
111111
{int backlog,
112-
bool v6Only: false,
113-
bool requestClientCertificate: false,
114-
bool shared: false}) {
112+
bool v6Only = false,
113+
bool requestClientCertificate = false,
114+
bool shared = false}) {
115115
if (backlog == null) backlog = 0;
116116

117117
return _loopback(
@@ -143,7 +143,7 @@ class HttpMultiServer extends StreamView<HttpRequest> implements HttpServer {
143143
// Reuse the IPv4 server's port so that if [port] is 0, both servers use
144144
// the same ephemeral port.
145145
var v6Server = await bind(InternetAddress.loopbackIPv6, v4Server.port);
146-
return new HttpMultiServer([v4Server, v6Server]);
146+
return HttpMultiServer([v4Server, v6Server]);
147147
} on SocketException catch (error) {
148148
if (error.osError.errorCode != _addressInUseErrno) rethrow;
149149
if (port != 0) rethrow;
@@ -152,18 +152,18 @@ class HttpMultiServer extends StreamView<HttpRequest> implements HttpServer {
152152
// A port being available on IPv4 doesn't necessarily mean that the same
153153
// port is available on IPv6. If it's not (which is rare in practice),
154154
// we try again until we find one that's available on both.
155-
v4Server.close();
155+
await v4Server.close();
156156
return await _loopback(port, bind, remainingRetries - 1);
157157
}
158158
}
159159

160-
Future close({bool force: false}) =>
160+
Future close({bool force = false}) =>
161161
Future.wait(_servers.map((server) => server.close(force: force)));
162162

163163
/// Returns an HttpConnectionsInfo object summarizing the total number of
164164
/// current connections handled by all the servers.
165165
HttpConnectionsInfo connectionsInfo() {
166-
var info = new HttpConnectionsInfo();
166+
var info = HttpConnectionsInfo();
167167
for (var server in _servers) {
168168
var subInfo = server.connectionsInfo();
169169
info.total += subInfo.total;

lib/src/utils.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'dart:io';
99
final Future<bool> supportsIPv6 = () async {
1010
try {
1111
var socket = await ServerSocket.bind(InternetAddress.loopbackIPv6, 0);
12-
socket.close();
12+
await socket.close();
1313
return true;
1414
} on SocketException catch (_) {
1515
return false;
@@ -20,7 +20,7 @@ final Future<bool> supportsIPv6 = () async {
2020
final Future<bool> supportsIPv4 = () async {
2121
try {
2222
var socket = await ServerSocket.bind(InternetAddress.loopbackIPv4, 0);
23-
socket.close();
23+
await socket.close();
2424
return true;
2525
} on SocketException catch (_) {
2626
return false;

pubspec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ dependencies:
1313

1414
dev_dependencies:
1515
http: ^0.12.0
16+
pedantic: ^1.4.0
1617
test: ^1.5.2

test/http_multi_server_test.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ import 'package:test/test.dart';
1313
void main() {
1414
group("with multiple HttpServers", () {
1515
var multiServer;
16-
var subServer1;
17-
var subServer2;
18-
var subServer3;
16+
HttpServer subServer1;
17+
HttpServer subServer2;
18+
HttpServer subServer3;
1919
setUp(() {
2020
return Future.wait([
2121
HttpServer.bind("localhost", 0).then((server) => subServer1 = server),
2222
HttpServer.bind("localhost", 0).then((server) => subServer2 = server),
2323
HttpServer.bind("localhost", 0).then((server) => subServer3 = server)
24-
]).then((servers) => multiServer = new HttpMultiServer(servers));
24+
]).then((servers) => multiServer = HttpMultiServer(servers));
2525
});
2626

2727
tearDown(() => multiServer.close());
@@ -127,8 +127,8 @@ void main() {
127127

128128
test("connectionsInfo sums the values for all servers", () {
129129
var pendingRequests = 0;
130-
var awaitingResponseCompleter = new Completer();
131-
var sendResponseCompleter = new Completer();
130+
var awaitingResponseCompleter = Completer();
131+
var sendResponseCompleter = Completer();
132132
multiServer.listen((request) {
133133
sendResponseCompleter.future.then((_) {
134134
request.response.write("got request");
@@ -159,7 +159,7 @@ void main() {
159159
group("HttpMultiServer.loopback", () {
160160
var server;
161161
setUp(() {
162-
return HttpMultiServer.loopback(0).then((server_) => server = server_);
162+
return HttpMultiServer.loopback(0).then((s) => server = s);
163163
});
164164

165165
tearDown(() => server.close());

0 commit comments

Comments
 (0)