Skip to content

Commit 3c4ef12

Browse files
committed
fixup
1 parent 31d0ee3 commit 3c4ef12

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
@@ -1096,7 +1096,7 @@ impl<S: Service> Client<S> {
10961096
Res: RpcMessage,
10971097
{
10981098
let request = self.request();
1099-
async move { Ok(request.await?.rpc(msg).await?) }
1099+
async move { request.await?.rpc(msg).await }
11001100
}
11011101

11021102
/// Performs a request for which the server returns a mpsc receiver.
@@ -1113,10 +1113,10 @@ impl<S: Service> Client<S> {
11131113
{
11141114
let request = self.request();
11151115
async move {
1116-
Ok(request
1116+
request
11171117
.await?
11181118
.server_streaming(msg, local_response_cap)
1119-
.await?)
1119+
.await
11201120
}
11211121
}
11221122

@@ -1134,12 +1134,7 @@ impl<S: Service> Client<S> {
11341134
Res: RpcMessage,
11351135
{
11361136
let request = self.request();
1137-
async move {
1138-
Ok(request
1139-
.await?
1140-
.client_streaming(msg, local_update_cap)
1141-
.await?)
1142-
}
1137+
async move { request.await?.client_streaming(msg, local_update_cap).await }
11431138
}
11441139

11451140
/// Performs a request for which the client can send updates, and the server returns a mpsc receiver.
@@ -1158,10 +1153,10 @@ impl<S: Service> Client<S> {
11581153
{
11591154
let request = self.request();
11601155
async move {
1161-
Ok(request
1156+
request
11621157
.await?
11631158
.bidi_streaming(msg, local_update_cap, local_response_cap)
1164-
.await?)
1159+
.await
11651160
}
11661161
}
11671162

@@ -1175,7 +1170,7 @@ impl<S: Service> Client<S> {
11751170
Req: Channels<S, Tx = NoSender, Rx = NoReceiver>,
11761171
{
11771172
let request = self.request();
1178-
async move { Ok(request.await?.notify(msg).await?) }
1173+
async move { request.await?.notify(msg).await }
11791174
}
11801175
}
11811176

@@ -1938,7 +1933,7 @@ pub enum Request<S: Service> {
19381933
#[cfg(feature = "rpc")]
19391934
Remote(crate::rpc::RemoteSender<S>),
19401935
#[cfg(not(feature = "rpc"))]
1941-
Remote,
1936+
Remote(()),
19421937
}
19431938

19441939
impl<S: Service> Request<S> {
@@ -1948,7 +1943,7 @@ impl<S: Service> Request<S> {
19481943
#[cfg(feature = "rpc")]
19491944
Self::Remote(s) => s.is_new_connection(),
19501945
#[cfg(not(feature = "rpc"))]
1951-
Self::Remote => false,
1946+
Self::Remote(()) => false,
19521947
}
19531948
}
19541949

0 commit comments

Comments
 (0)