Skip to content

Commit aa7bf50

Browse files
committed
fixup
1 parent 27d7f77 commit aa7bf50

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

src/lib.rs

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ impl<S: Service> Client<S> {
10001000
Res: RpcMessage,
10011001
{
10021002
let request = self.request();
1003-
async move { Ok(request.await?.rpc(msg).await?) }
1003+
async move { request.await?.rpc(msg).await }
10041004
}
10051005

10061006
/// Performs a request for which the server returns a mpsc receiver.
@@ -1017,10 +1017,10 @@ impl<S: Service> Client<S> {
10171017
{
10181018
let request = self.request();
10191019
async move {
1020-
Ok(request
1020+
request
10211021
.await?
10221022
.server_streaming(msg, local_response_cap)
1023-
.await?)
1023+
.await
10241024
}
10251025
}
10261026

@@ -1038,12 +1038,7 @@ impl<S: Service> Client<S> {
10381038
Res: RpcMessage,
10391039
{
10401040
let request = self.request();
1041-
async move {
1042-
Ok(request
1043-
.await?
1044-
.client_streaming(msg, local_update_cap)
1045-
.await?)
1046-
}
1041+
async move { request.await?.client_streaming(msg, local_update_cap).await }
10471042
}
10481043

10491044
/// Performs a request for which the client can send updates, and the server returns a mpsc receiver.
@@ -1062,10 +1057,10 @@ impl<S: Service> Client<S> {
10621057
{
10631058
let request = self.request();
10641059
async move {
1065-
Ok(request
1060+
request
10661061
.await?
10671062
.bidi_streaming(msg, local_update_cap, local_response_cap)
1068-
.await?)
1063+
.await
10691064
}
10701065
}
10711066

@@ -1079,7 +1074,7 @@ impl<S: Service> Client<S> {
10791074
Req: Channels<S, Tx = NoSender, Rx = NoReceiver>,
10801075
{
10811076
let request = self.request();
1082-
async move { Ok(request.await?.notify(msg).await?) }
1077+
async move { request.await?.notify(msg).await }
10831078
}
10841079
}
10851080

@@ -1842,7 +1837,7 @@ pub enum Request<S: Service> {
18421837
#[cfg(feature = "rpc")]
18431838
Remote(crate::rpc::RemoteSender<S>),
18441839
#[cfg(not(feature = "rpc"))]
1845-
Remote,
1840+
Remote(()),
18461841
}
18471842

18481843
impl<S: Service> Request<S> {
@@ -1852,7 +1847,7 @@ impl<S: Service> Request<S> {
18521847
#[cfg(feature = "rpc")]
18531848
Self::Remote(s) => s.is_new_connection(),
18541849
#[cfg(not(feature = "rpc"))]
1855-
Self::Remote => false,
1850+
Self::Remote(()) => false,
18561851
}
18571852
}
18581853

0 commit comments

Comments
 (0)