Skip to content

Commit c47e11e

Browse files
stepanchegtikue
authored andcommitted
Use specific names instead of Default
1 parent a21b609 commit c47e11e

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

tarpc/examples/custom_transport.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// https://opensource.org/licenses/MIT.
66

77
use futures::prelude::*;
8+
use tarpc::client;
89
use tarpc::context::Context;
910
use tarpc::serde_transport as transport;
1011
use tarpc::server::{BaseChannel, Channel};
@@ -50,7 +51,7 @@ async fn main() -> anyhow::Result<()> {
5051

5152
let conn = UnixStream::connect(bind_addr).await?;
5253
let transport = transport::new(codec_builder.new_framed(conn), Bincode::default());
53-
PingServiceClient::new(Default::default(), transport)
54+
PingServiceClient::new(client::Config::default(), transport)
5455
.spawn()
5556
.ping(tarpc::context::current())
5657
.await?;

tarpc/examples/tls_over_tcp.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use tokio_rustls::rustls::{
1818
};
1919
use tokio_rustls::{TlsAcceptor, TlsConnector};
2020

21+
use tarpc::client;
2122
use tarpc::context::Context;
2223
use tarpc::serde_transport as transport;
2324
use tarpc::server::{BaseChannel, Channel};
@@ -144,7 +145,7 @@ async fn main() -> anyhow::Result<()> {
144145
let stream = connector.connect(domain, stream).await?;
145146

146147
let transport = transport::new(codec_builder.new_framed(stream), Bincode::default());
147-
let answer = PingServiceClient::new(Default::default(), transport)
148+
let answer = PingServiceClient::new(client::Config::default(), transport)
148149
.spawn()
149150
.ping(tarpc::context::current())
150151
.await?;

tarpc/src/client/in_flight_requests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ pub struct InFlightRequests<Resp> {
2121
impl<Resp> Default for InFlightRequests<Resp> {
2222
fn default() -> Self {
2323
Self {
24-
request_data: Default::default(),
25-
deadlines: Default::default(),
24+
request_data: FnvHashMap::default(),
25+
deadlines: DelayQueue::default(),
2626
}
2727
}
2828
}

tarpc/src/client/stub/load_balance.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ mod round_robin {
6666
pub fn new(elements: Vec<T>) -> Self {
6767
Self(Arc::new(State {
6868
elements,
69-
next: Default::default(),
69+
next: AtomicUsize::new(0),
7070
}))
7171
}
7272

tarpc/src/server/testing.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ impl<Req, Resp> FakeChannel<io::Result<TrackedRequest<Req>>, Response<Resp>> {
9494
request: Request {
9595
context: context::Context {
9696
deadline: Instant::now(),
97-
trace_context: Default::default(),
97+
trace_context: crate::trace::Context::default(),
9898
},
9999
id,
100100
message,
@@ -114,10 +114,10 @@ impl FakeChannel<(), ()> {
114114
pub fn default<Req, Resp>() -> FakeChannel<io::Result<TrackedRequest<Req>>, Response<Resp>> {
115115
let (request_cancellation, canceled_requests) = cancellations();
116116
FakeChannel {
117-
stream: Default::default(),
118-
sink: Default::default(),
119-
config: Default::default(),
120-
in_flight_requests: Default::default(),
117+
stream: VecDeque::default(),
118+
sink: VecDeque::default(),
119+
config: Config::default(),
120+
in_flight_requests: super::in_flight_requests::InFlightRequests::default(),
121121
request_cancellation,
122122
canceled_requests,
123123
}

0 commit comments

Comments
 (0)