Skip to content

Commit 3b6ab5e

Browse files
authored
Remove usages of Delegating*.typed (#365)
These usages all pass static type checking without being wrapped in extra layers.
1 parent 8b70a1b commit 3b6ab5e

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.12.1-dev
2+
3+
* Remove dependency on `package:async`.
4+
15
## 0.12.0+4
26

37
* Fix a bug setting the `'content-type'` header in `MultipartRequest`.

lib/src/io_client.dart

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import 'dart:async';
66
import 'dart:io';
77

8-
import 'package:async/async.dart';
9-
108
import 'base_client.dart';
119
import 'base_request.dart';
1210
import 'exception.dart';
@@ -39,17 +37,15 @@ class IOClient extends BaseClient {
3937
ioRequest.headers.set(name, value);
4038
});
4139

42-
var response =
43-
await stream.pipe(DelegatingStreamConsumer.typed(ioRequest))
44-
as HttpClientResponse;
40+
var response = await stream.pipe(ioRequest) as HttpClientResponse;
4541

4642
var headers = <String, String>{};
4743
response.headers.forEach((key, values) {
4844
headers[key] = values.join(',');
4945
});
5046

5147
return StreamedResponse(
52-
DelegatingStream.typed<List<int>>(response).handleError(
48+
response.handleError(
5349
(HttpException error) =>
5450
throw ClientException(error.message, error.uri),
5551
test: (error) => error is HttpException),

lib/src/multipart_file_io.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import 'dart:async';
66
import 'dart:io';
77

8-
import 'package:async/async.dart';
98
import 'package:http_parser/http_parser.dart';
109
import 'package:path/path.dart' as p;
1110

@@ -17,7 +16,7 @@ Future<MultipartFile> multipartFileFromPath(String field, String filePath,
1716
filename ??= p.basename(filePath);
1817
var file = File(filePath);
1918
var length = await file.length();
20-
var stream = ByteStream(DelegatingStream.typed(file.openRead()));
19+
var stream = ByteStream(file.openRead());
2120
return MultipartFile(field, stream, length,
2221
filename: filename, contentType: contentType);
2322
}

pubspec.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
name: http
2-
version: 0.12.0+4
2+
version: 0.12.1-dev
33
homepage: https://github.com/dart-lang/http
44
description: A composable, multi-platform, Future-based API for HTTP requests.
55

66
environment:
77
sdk: ">=2.4.0 <3.0.0"
88

99
dependencies:
10-
async: ">=1.10.0 <3.0.0"
1110
http_parser: ">=0.0.1 <4.0.0"
1211
path: ">=0.9.0 <2.0.0"
1312
pedantic: "^1.0.0"

0 commit comments

Comments
 (0)