Skip to content

Commit 58e6f35

Browse files
committed
Replace impl TryStream with impl Stream
1 parent 5fca904 commit 58e6f35

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

src/addr/get.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
use futures::{
44
future::{self, Either},
5-
stream::{StreamExt, TryStream, TryStreamExt},
5+
stream::{Stream, StreamExt, TryStreamExt},
66
FutureExt,
77
};
88
use std::net::IpAddr;
@@ -34,7 +34,7 @@ impl AddressGetRequest {
3434
&mut self.message
3535
}
3636

37-
pub fn execute(self) -> impl TryStream<Ok = AddressMessage, Error = Error> {
37+
pub fn execute(self) -> impl Stream<Item = Result<AddressMessage, Error>> {
3838
let AddressGetRequest {
3939
mut handle,
4040
message,

src/link/get.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
use futures::{
44
future::{self, Either},
5-
stream::{StreamExt, TryStream},
5+
stream::{Stream, StreamExt},
66
FutureExt,
77
};
88
use netlink_packet_core::{NetlinkMessage, NLM_F_DUMP, NLM_F_REQUEST};
@@ -48,7 +48,7 @@ impl LinkGetRequest {
4848
}
4949

5050
/// Execute the request
51-
pub fn execute(self) -> impl TryStream<Ok = LinkMessage, Error = Error> {
51+
pub fn execute(self) -> impl Stream<Item = Result<LinkMessage, Error>> {
5252
let LinkGetRequest {
5353
mut handle,
5454
message,

src/neighbour/get.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
use futures::{
44
future::{self, Either},
5-
stream::{StreamExt, TryStream},
5+
stream::{Stream, StreamExt},
66
FutureExt,
77
};
88
use netlink_packet_core::{
@@ -41,7 +41,7 @@ impl NeighbourGetRequest {
4141
/// Execute the request
4242
pub fn execute(
4343
self,
44-
) -> impl TryStream<Ok = NeighbourMessage, Error = Error> {
44+
) -> impl Stream<Item = Result<NeighbourMessage, Error>> {
4545
let NeighbourGetRequest {
4646
mut handle,
4747
message,

src/route/get.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
use futures::{
44
future::{self, Either},
5-
stream::{StreamExt, TryStream},
5+
stream::{Stream, StreamExt},
66
FutureExt,
77
};
88

@@ -45,7 +45,7 @@ impl RouteGetRequest {
4545
&mut self.message
4646
}
4747

48-
pub fn execute(self) -> impl TryStream<Ok = RouteMessage, Error = Error> {
48+
pub fn execute(self) -> impl Stream<Item = Result<RouteMessage, Error>> {
4949
let RouteGetRequest {
5050
mut handle,
5151
message,

src/rule/get.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
use futures::{
44
future::{self, Either},
5-
stream::{StreamExt, TryStream},
5+
stream::{Stream, StreamExt},
66
FutureExt,
77
};
88
use netlink_packet_core::{NetlinkMessage, NLM_F_DUMP, NLM_F_REQUEST};
@@ -37,7 +37,7 @@ impl RuleGetRequest {
3737
&mut self.message
3838
}
3939

40-
pub fn execute(self) -> impl TryStream<Ok = RuleMessage, Error = Error> {
40+
pub fn execute(self) -> impl Stream<Item = Result<RuleMessage, Error>> {
4141
let RuleGetRequest {
4242
mut handle,
4343
message,

src/traffic_control/get.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
use futures::{
44
future::{self, Either},
5-
stream::{StreamExt, TryStream},
5+
stream::{Stream, StreamExt},
66
FutureExt,
77
};
88
use netlink_packet_core::{NetlinkMessage, NLM_F_DUMP, NLM_F_REQUEST};
@@ -27,7 +27,7 @@ impl QDiscGetRequest {
2727
}
2828

2929
/// Execute the request
30-
pub fn execute(self) -> impl TryStream<Ok = TcMessage, Error = Error> {
30+
pub fn execute(self) -> impl Stream<Item = Result<TcMessage, Error>> {
3131
let QDiscGetRequest {
3232
mut handle,
3333
message,
@@ -73,7 +73,7 @@ impl TrafficClassGetRequest {
7373
}
7474

7575
/// Execute the request
76-
pub fn execute(self) -> impl TryStream<Ok = TcMessage, Error = Error> {
76+
pub fn execute(self) -> impl Stream<Item = Result<TcMessage, Error>> {
7777
let TrafficClassGetRequest {
7878
mut handle,
7979
message,
@@ -107,7 +107,7 @@ impl TrafficFilterGetRequest {
107107
}
108108

109109
/// Execute the request
110-
pub fn execute(self) -> impl TryStream<Ok = TcMessage, Error = Error> {
110+
pub fn execute(self) -> impl Stream<Item = Result<TcMessage, Error>> {
111111
let TrafficFilterGetRequest {
112112
mut handle,
113113
message,
@@ -148,7 +148,7 @@ impl TrafficChainGetRequest {
148148
}
149149

150150
/// Execute the request
151-
pub fn execute(self) -> impl TryStream<Ok = TcMessage, Error = Error> {
151+
pub fn execute(self) -> impl Stream<Item = Result<TcMessage, Error>> {
152152
let TrafficChainGetRequest {
153153
mut handle,
154154
message,

0 commit comments

Comments
 (0)