Skip to content

Commit 36ee0f9

Browse files
fafhrd91fafhrd91
authored
Clippy (#60)
1 parent 865f2bc commit 36ee0f9

File tree

11 files changed

+28
-33
lines changed

11 files changed

+28
-33
lines changed

‎Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ rand = "0.8.4"
4646
# HPACK fixtures
4747
hex = "0.4.3"
4848
walkdir = "2.3.2"
49-
serde = "1.0"
50-
serde_json = "1.0"
49+
serde = "1"
50+
serde_json = "1"
5151

5252
ntex = { version = "2", features = ["openssl"] }
5353
ntex-tls = { version = "2", features = ["openssl"] }
5454
openssl = "0.10"
5555

5656
# Examples
57-
env_logger = { version = "0.11", default-features = false }
57+
env_logger = "0.11"
5858

5959
[patch.crates-io]
6060
ntex-h2 = { path = "." }

‎src/client/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ impl Clone for ClientError {
6262
Self::HandshakeTimeout => Self::HandshakeTimeout,
6363
Self::Connect(err) => Self::Connect(err.clone()),
6464
Self::Disconnected(err) => {
65-
Self::Disconnected(std::io::Error::new(err.kind(), format!("{}", err)))
65+
Self::Disconnected(std::io::Error::new(err.kind(), format!("{err}")))
6666
}
6767
}
6868
}

‎src/client/stream.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,13 +245,12 @@ impl Service<Message> for HandleService {
245245

246246
if eof {
247247
self.0.notify(id);
248-
log::debug!("Stream {:?} is closed, notify", id);
248+
log::debug!("Stream {id:?} is closed, notify");
249249
}
250250
} else if !matches!(msg.kind(), MessageKind::Disconnect(_)) {
251251
log::error!(
252-
"{}: Received message for unknown stream, {:?}",
252+
"{}: Received message for unknown stream, {msg:?}",
253253
msg.stream().tag(),
254-
msg
255254
);
256255
}
257256
Ok(())

‎src/connection.rs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ impl Connection {
7777

7878
// send setting to the peer
7979
let settings = config.0.settings.get();
80-
log::debug!("Sending local settings {:?}", settings);
80+
log::debug!("Sending local settings {settings:?}");
8181
io.encode(settings.into(), &codec).unwrap();
8282

8383
let mut recv_window = Window::new(frame::DEFAULT_INITIAL_WINDOW_SIZE as i32);
@@ -89,7 +89,7 @@ impl Connection {
8989
config.0.connection_window_sz.get(),
9090
config.0.connection_window_sz_threshold.get(),
9191
) {
92-
log::debug!("Sending connection window update to {:?}", val);
92+
log::debug!("Sending connection window update to {val:?}");
9393
io.encode(WindowUpdate::new(StreamId::CON, val).into(), &codec)
9494
.unwrap();
9595
};
@@ -384,9 +384,8 @@ impl Connection {
384384
let mut streams = self.0.streams.borrow_mut();
385385
if let Some(stream) = streams.remove(&id) {
386386
log::trace!(
387-
"{}: Dropping stream {:?} remote: {:?}",
387+
"{}: Dropping stream {id:?} remote: {:?}",
388388
self.tag(),
389-
id,
390389
stream.is_remote()
391390
);
392391
if stream.is_remote() {
@@ -585,7 +584,7 @@ impl RecvHalfConnection {
585584
&self,
586585
settings: frame::Settings,
587586
) -> Result<(), Either<ConnectionError, Vec<StreamErrorInner>>> {
588-
log::trace!("processing incoming settings: {:#?}", settings);
587+
log::trace!("processing incoming settings: {settings:#?}");
589588

590589
if settings.is_ack() {
591590
if !self.flags().contains(ConnectionFlags::SETTINGS_PROCESSED) {
@@ -654,11 +653,7 @@ impl RecvHalfConnection {
654653
if let Some(val) = settings.initial_window_size() {
655654
let old_val = self.0.remote_window_sz.get();
656655
self.0.remote_window_sz.set(val);
657-
log::trace!(
658-
"Update remote initial window size to {} from {}",
659-
val,
660-
old_val
661-
);
656+
log::trace!("Update remote initial window size to {val} from {old_val}");
662657

663658
let mut stream_errors = Vec::new();
664659

@@ -710,7 +705,7 @@ impl RecvHalfConnection {
710705
} else if self.0.local_pending_reset.is_pending(frm.stream_id()) {
711706
Ok(())
712707
} else if self.0.err_unknown_streams() {
713-
log::trace!("Unknown WINDOW_UPDATE {:?}", frm);
708+
log::trace!("Unknown WINDOW_UPDATE {frm:?}");
714709
Err(Either::Left(ConnectionError::UnknownStream(
715710
"WINDOW_UPDATE",
716711
)))

‎src/default.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl<E: fmt::Debug + 'static> Service<Control<E>> for DefaultControlService {
2828
msg: Control<E>,
2929
_: ServiceCtx<'_, Self>,
3030
) -> Result<Self::Response, Self::Error> {
31-
log::trace!("Default control service is used: {:?}", msg);
31+
log::trace!("Default control service is used: {msg:?}");
3232
Ok(msg.ack())
3333
}
3434
}

‎src/error.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,18 @@ impl ConnectionError {
5353
ConnectionError::Decoder(_) => {
5454
GoAway::new(Reason::PROTOCOL_ERROR).set_data("Error during frame decoding")
5555
}
56-
ConnectionError::MissingPseudo(s) => GoAway::new(Reason::PROTOCOL_ERROR)
57-
.set_data(format!("Missing pseudo header {:?}", s)),
56+
ConnectionError::MissingPseudo(s) => {
57+
GoAway::new(Reason::PROTOCOL_ERROR).set_data(format!("Missing pseudo header {s:?}"))
58+
}
5859
ConnectionError::UnexpectedPseudo(s) => GoAway::new(Reason::PROTOCOL_ERROR)
59-
.set_data(format!("Unexpected pseudo header {:?}", s)),
60+
.set_data(format!("Unexpected pseudo header {s:?}")),
6061
ConnectionError::UnknownStream(_) => {
6162
GoAway::new(Reason::PROTOCOL_ERROR).set_data("Unknown stream")
6263
}
6364
ConnectionError::InvalidStreamId(_) => GoAway::new(Reason::PROTOCOL_ERROR)
6465
.set_data("An invalid stream identifier was provided"),
6566
ConnectionError::StreamClosed(s, _) => {
66-
GoAway::new(Reason::STREAM_CLOSED).set_data(format!("{:?} is closed", s))
67+
GoAway::new(Reason::STREAM_CLOSED).set_data(format!("{s:?} is closed"))
6768
}
6869
ConnectionError::UnexpectedSettingsAck => {
6970
GoAway::new(Reason::PROTOCOL_ERROR).set_data("Received unexpected settings ack")

‎src/frame/headers.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ impl HeaderBlock {
458458
log::trace!("load_hpack; connection level header");
459459
malformed = true;
460460
} else if name == header::TE && value != "trailers" {
461-
log::trace!("load_hpack; TE header not set to trailers; val={:?}", value);
461+
log::trace!("load_hpack; TE header not set to trailers; val={value:?}");
462462
malformed = true;
463463
} else {
464464
reg = true;
@@ -487,7 +487,7 @@ impl HeaderBlock {
487487
});
488488

489489
if let Err(e) = res {
490-
log::trace!("hpack decoding error; err={:?}", e);
490+
log::trace!("hpack decoding error; err={e:?}");
491491
return Err(e.into());
492492
}
493493

‎src/frame/settings.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ impl Settings {
211211
}
212212

213213
pub fn encode(&self, dst: &mut BytesMut) {
214-
log::trace!("encoding SETTINGS; len={:?}", self);
214+
log::trace!("encoding SETTINGS; len={self:?}");
215215

216216
// Create & encode an appropriate frame head
217217
let head = Head::new(Kind::Settings, self.flags.into(), StreamId::zero());
@@ -220,7 +220,7 @@ impl Settings {
220220

221221
// Encode the settings
222222
self.for_each(|setting| {
223-
log::trace!("encoding setting; val={:?}", setting);
223+
log::trace!("encoding setting; val={setting:?}");
224224
setting.encode(dst)
225225
});
226226
}

‎src/frame/util.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pub(super) fn debug_flags<'a, 'f: 'a>(
4242
fmt: &'a mut fmt::Formatter<'f>,
4343
bits: u8,
4444
) -> DebugFlags<'a, 'f> {
45-
let result = write!(fmt, "({:#x}", bits);
45+
let result = write!(fmt, "({bits:#x}");
4646
DebugFlags {
4747
fmt,
4848
result,
@@ -67,7 +67,7 @@ impl<'a, 'f: 'a> DebugFlags<'a, 'f> {
6767
": "
6868
};
6969

70-
write!(self.fmt, "{}{}", prefix, name)
70+
write!(self.fmt, "{prefix}{name}")
7171
});
7272
}
7373
self

‎src/hpack/table.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ impl Table {
315315
probe_loop!(probe < self.indices.len(), {
316316
let pos = &mut self.indices[probe];
317317

318-
prev = match mem::replace(pos, Some(prev)) {
318+
prev = match pos.replace(prev) {
319319
Some(p) => p,
320320
None => break,
321321
};

0 commit comments

Comments
 (0)