Skip to content

Commit 8c5121f

Browse files
Tim-ZhangTim-Zhang
authored
Merge pull request #171 from jsturtevant/fixes-for-latest-rust
Clippy Fixes for latest rust (1.67)
2 parents 964a095 + 4ad4088 commit 8c5121f

File tree

10 files changed

+26
-37
lines changed

10 files changed

+26
-37
lines changed

‎src/asynchronous/client.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl Client {
8080
self.req_tx
8181
.send(msg)
8282
.await
83-
.map_err(|e| Error::Others(format!("Send packet to sender error {:?}", e)))?;
83+
.map_err(|e| Error::Others(format!("Send packet to sender error {e:?}")))?;
8484

8585
let result = if timeout_nano == 0 {
8686
rx.recv()
@@ -92,7 +92,7 @@ impl Client {
9292
rx.recv(),
9393
)
9494
.await
95-
.map_err(|e| Error::Others(format!("Receive packet timeout {:?}", e)))?
95+
.map_err(|e| Error::Others(format!("Receive packet timeout {e:?}")))?
9696
.ok_or_else(|| Error::Others("Receive packet from receiver error".to_string()))?
9797
};
9898

@@ -133,7 +133,7 @@ impl Client {
133133
self.req_tx
134134
.send(msg)
135135
.await
136-
.map_err(|e| Error::Others(format!("Send packet to sender error {:?}", e)))?;
136+
.map_err(|e| Error::Others(format!("Send packet to sender error {e:?}")))?;
137137

138138
Ok(StreamInner::new(
139139
stream_id,
@@ -210,7 +210,7 @@ impl WriterDelegate for ClientWriter {
210210

211211
// TODO: if None
212212
if let Some(resp_tx) = resp_tx {
213-
let e = Error::Socket(format!("{:?}", e));
213+
let e = Error::Socket(format!("{e:?}"));
214214
resp_tx
215215
.send(Err(e))
216216
.await
@@ -294,8 +294,7 @@ impl ReaderDelegate for ClientReader {
294294
};
295295
resp_tx
296296
.send(Err(Error::Others(format!(
297-
"Recver got malformed packet {:?}",
298-
msg
297+
"Recver got malformed packet {msg:?}"
299298
))))
300299
.await
301300
.unwrap_or_else(|_e| error!("The request has returned"));

‎src/asynchronous/server.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -454,8 +454,7 @@ impl HandlerContext {
454454
get_status(
455455
Code::INVALID_ARGUMENT,
456456
format!(
457-
"Stream id {}: data close message connot include data",
458-
stream_id
457+
"Stream id {stream_id}: data close message connot include data"
459458
),
460459
),
461460
)
@@ -470,7 +469,7 @@ impl HandlerContext {
470469
stream_id,
471470
get_status(
472471
Code::INVALID_ARGUMENT,
473-
format!("Stream id {}: handling data error: {}", stream_id, e),
472+
format!("Stream id {stream_id}: handling data error: {e}"),
474473
),
475474
)
476475
.await;
@@ -616,8 +615,7 @@ impl HandlerContext {
616615
task.await
617616
.unwrap_or_else(|e| {
618617
Err(Error::Others(format!(
619-
"stream {} task got error {:?}",
620-
path, e
618+
"stream {path} task got error {e:?}"
621619
)))
622620
})
623621
.map_err(|e| get_status(Code::UNKNOWN, e))

‎src/asynchronous/stream.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ async fn _recv(rx: &mut ResultReceiver) -> Result<GenMessage> {
319319
async fn _send(tx: &MessageSender, msg: GenMessage) -> Result<()> {
320320
tx.send(msg)
321321
.await
322-
.map_err(|e| Error::Others(format!("Send data packet to sender error {:?}", e)))
322+
.map_err(|e| Error::Others(format!("Send data packet to sender error {e:?}")))
323323
}
324324

325325
#[derive(Clone, Copy, Debug, PartialEq, Eq)]

‎src/asynchronous/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,5 +269,5 @@ pub(crate) fn new_unix_stream_from_raw_fd(fd: RawFd) -> UnixStream {
269269
}
270270

271271
pub(crate) fn get_path(service: &str, method: &str) -> String {
272-
format!("/{}/{}", service, method)
272+
format!("/{service}/{method}")
273273
}

‎src/common.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ pub(crate) enum Domain {
2525
pub(crate) fn do_listen(listener: RawFd) -> Result<()> {
2626
if let Err(e) = fcntl(listener, FcntlArg::F_SETFL(OFlag::O_NONBLOCK)) {
2727
return Err(Error::Others(format!(
28-
"failed to set listener fd: {} as non block: {}",
29-
listener, e
28+
"failed to set listener fd: {listener} as non block: {e}"
3029
)));
3130
}
3231

@@ -43,7 +42,7 @@ fn parse_sockaddr(addr: &str) -> Result<(Domain, &str)> {
4342
return Ok((Domain::Vsock, addr));
4443
}
4544

46-
Err(Error::Others(format!("Scheme {:?} is not supported", addr)))
45+
Err(Error::Others(format!("Scheme {addr:?} is not supported")))
4746
}
4847

4948
#[cfg(not(any(target_os = "linux", target_os = "android")))]
@@ -57,7 +56,7 @@ fn parse_sockaddr(addr: &str) -> Result<(Domain, &str)> {
5756
return Ok((Domain::Unix, addr));
5857
}
5958

60-
Err(Error::Others(format!("Scheme {:?} is not supported", addr)))
59+
Err(Error::Others(format!("Scheme {addr:?} is not supported")))
6160
}
6261

6362
#[cfg(any(
@@ -67,8 +66,7 @@ fn parse_sockaddr(addr: &str) -> Result<(Domain, &str)> {
6766
pub(crate) fn set_fd_close_exec(fd: RawFd) -> Result<RawFd> {
6867
if let Err(e) = fcntl(fd, FcntlArg::F_SETFD(FdFlag::FD_CLOEXEC)) {
6968
return Err(Error::Others(format!(
70-
"failed to set fd: {} as close-on-exec: {}",
71-
fd, e
69+
"failed to set fd: {fd} as close-on-exec: {e}"
7270
)));
7371
}
7472
Ok(fd)
@@ -125,8 +123,7 @@ fn make_socket(addr: (&str, u32)) -> Result<(RawFd, Domain, SockAddr)> {
125123
let sockaddr_port_v: Vec<&str> = sockaddrv.split(':').collect();
126124
if sockaddr_port_v.len() != 2 {
127125
return Err(Error::Others(format!(
128-
"sockaddr {} is not right for vsock",
129-
sockaddr
126+
"sockaddr {sockaddr} is not right for vsock"
130127
)));
131128
}
132129
let port: u32 = sockaddr_port_v[1]

‎src/sync/channel.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ fn read_message_header(fd: RawFd) -> Result<MessageHeader> {
8989
if size != MESSAGE_HEADER_LENGTH {
9090
return Err(sock_error_msg(
9191
size,
92-
format!("Message header length {} is too small", size),
92+
format!("Message header length {size} is too small"),
9393
));
9494
}
9595

@@ -132,7 +132,7 @@ fn write_message_header(fd: RawFd, mh: MessageHeader) -> Result<()> {
132132
if size != MESSAGE_HEADER_LENGTH {
133133
return Err(sock_error_msg(
134134
size,
135-
format!("Send Message header length size {} is not right", size),
135+
format!("Send Message header length size {size} is not right"),
136136
));
137137
}
138138

@@ -146,7 +146,7 @@ pub fn write_message(fd: RawFd, mh: MessageHeader, buf: Vec<u8>) -> Result<()> {
146146
if size != buf.len() {
147147
return Err(sock_error_msg(
148148
size,
149-
format!("Send Message length size {} is not right", size),
149+
format!("Send Message length size {size} is not right"),
150150
));
151151
}
152152

‎src/sync/client.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ impl Client {
152152
let mut map = recver_map_orig.lock().unwrap();
153153
for (_, recver_tx) in map.iter_mut() {
154154
recver_tx
155-
.send(Err(Error::Socket(format!("socket error {}", y))))
155+
.send(Err(Error::Socket(format!("socket error {y}"))))
156156
.unwrap_or_else(|e| {
157157
error!("The request has returned error {:?}", e)
158158
});
@@ -177,8 +177,7 @@ impl Client {
177177
if mh.type_ != MESSAGE_TYPE_RESPONSE {
178178
recver_tx
179179
.send(Err(Error::Others(format!(
180-
"Recver got malformed packet {:?} {:?}",
181-
mh, buf
180+
"Recver got malformed packet {mh:?} {buf:?}"
182181
))))
183182
.unwrap_or_else(|_e| error!("The request has returned"));
184183
continue;

‎src/sync/server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ fn start_method_handler_thread(
190190
let method = if let Some(x) = methods.get(&path) {
191191
x
192192
} else {
193-
let status = get_status(Code::INVALID_ARGUMENT, format!("{} does not exist", path));
193+
let status = get_status(Code::INVALID_ARGUMENT, format!("{path} does not exist"));
194194
let mut res = Response::new();
195195
res.set_status(status);
196196
if let Err(x) = response_to_channel(mh.stream_id, res, res_tx.clone()) {

‎ttrpc-codegen/src/convert.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,7 @@ trait ProtobufOptions {
4141
impl<'a> ProtobufOptions for &'a [model::ProtobufOption] {
4242
fn by_name(&self, name: &str) -> Option<&model::ProtobufConstant> {
4343
let option_name = name;
44-
for &model::ProtobufOption {
45-
ref name,
46-
ref value,
47-
} in *self
48-
{
44+
for model::ProtobufOption { name, value } in *self {
4945
if name == option_name {
5046
return Some(value);
5147
}
@@ -224,7 +220,7 @@ impl AbsolutePath {
224220
} else {
225221
assert!(!path.starts_with('.'));
226222
assert!(!path.ends_with('.'));
227-
AbsolutePath::new(format!(".{}", path))
223+
AbsolutePath::new(format!(".{path}"))
228224
}
229225
}
230226

@@ -396,7 +392,7 @@ struct Resolver<'a> {
396392

397393
impl<'a> Resolver<'a> {
398394
fn map_entry_name_for_field_name(field_name: &str) -> String {
399-
format!("{}_MapEntry", field_name)
395+
format!("{field_name}_MapEntry")
400396
}
401397

402398
fn map_entry_field(
@@ -964,7 +960,7 @@ impl<'a> Resolver<'a> {
964960
v.map_err(|()| {
965961
ConvertError::UnsupportedExtensionType(
966962
option_name.to_owned(),
967-
format!("{:?}", field_type),
963+
format!("{field_type:?}"),
968964
)
969965
})
970966
}

‎ttrpc-codegen/src/parser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ impl<'a> Parser<'a> {
912912

913913
fn next_ident_if_in(&mut self, idents: &[&str]) -> ParserResult<Option<String>> {
914914
let v = match self.lookahead()? {
915-
Some(&Token::Ident(ref next)) => {
915+
Some(Token::Ident(next)) => {
916916
if idents.iter().any(|i| i == next) {
917917
next.clone()
918918
} else {

0 commit comments

Comments
 (0)