1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
Index: combine/Cargo.toml
===================================================================
--- combine.orig/Cargo.toml
+++ combine/Cargo.toml
@@ -85,11 +85,6 @@ required-features = ["mp4"]
version = "1"
optional = true
-[dependencies.bytes_05]
-version = "0.5"
-optional = true
-package = "bytes"
-
[dependencies.futures-core-03]
version = "0.3.1"
optional = true
@@ -114,19 +109,6 @@ optional = true
version = "1"
optional = true
-[dependencies.tokio-02-dep]
-version = "0.2.3"
-features = ["io-util"]
-optional = true
-default-features = false
-package = "tokio"
-
-[dependencies.tokio-03-dep]
-version = "0.3"
-optional = true
-default-features = false
-package = "tokio"
-
[dependencies.tokio-dep]
version = "1"
optional = true
@@ -145,10 +127,6 @@ version = "1"
[dev-dependencies.bytes]
version = "1"
-[dev-dependencies.bytes_05]
-version = "0.5"
-package = "bytes"
-
[dev-dependencies.criterion]
version = "0.3"
default-features = false
@@ -166,25 +144,6 @@ version = "2.0"
[dev-dependencies.quickcheck]
version = "1.0.3"
-[dev-dependencies.tokio-02-dep]
-version = "0.2"
-features = [
- "fs",
- "io-driver",
- "io-util",
- "macros",
-]
-package = "tokio"
-
-[dev-dependencies.tokio-03-dep]
-version = "0.3"
-features = [
- "fs",
- "macros",
- "rt-multi-thread",
-]
-package = "tokio"
-
[dev-dependencies.tokio-dep]
version = "1"
features = [
@@ -219,18 +178,4 @@ tokio = [
"futures-core-03",
"pin-project-lite",
]
-tokio-02 = [
- "pin-project",
- "std",
- "tokio-02-dep",
- "futures-core-03",
- "pin-project-lite",
- "bytes_05",
-]
-tokio-03 = [
- "pin-project",
- "std",
- "tokio-03-dep",
- "futures-core-03",
- "pin-project-lite",
-]
+
Index: combine/tests/support/mod.rs
===================================================================
--- combine.orig/tests/support/mod.rs
+++ combine/tests/support/mod.rs
@@ -30,7 +30,7 @@ where
}
}
-impl<R> tokio_02_dep::io::AsyncRead for PartialAsyncRead<R>
+/*impl<R> tokio_02_dep::io::AsyncRead for PartialAsyncRead<R>
where
R: tokio_02_dep::io::AsyncRead + Unpin,
{
@@ -95,7 +95,7 @@ where
Some(PartialOp::Unlimited) | None => Pin::new(&mut self.inner).poll_read(cx, buf),
}
}
-}
+}*/
impl<R> tokio_dep::io::AsyncRead for PartialAsyncRead<R>
where
|
