Skip to content

Commit a531810

Browse files
committed
Fix clippy lints
1 parent 918fc9a commit a531810

File tree

9 files changed

+25
-27
lines changed

9 files changed

+25
-27
lines changed

src/calloop.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ impl calloop::EventSource for EisRequestSource {
206206
}
207207
Err(err) => {
208208
// TODO return handshake errors?
209-
eprintln!("Client handshake failed: {}", err);
209+
eprintln!("Client handshake failed: {err}");
210210
Ok(calloop::PostAction::Remove)
211211
}
212212
}

src/ei.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub use crate::eiproto_ei::*;
2424
pub struct Context(pub(crate) Backend);
2525

2626
impl AsFd for Context {
27-
fn as_fd(&self) -> BorrowedFd {
27+
fn as_fd(&self) -> BorrowedFd<'_> {
2828
self.0.as_fd()
2929
}
3030
}

src/eis.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ impl Listener {
7575
}
7676

7777
impl AsFd for Listener {
78-
fn as_fd(&self) -> BorrowedFd {
78+
fn as_fd(&self) -> BorrowedFd<'_> {
7979
self.listener.as_fd()
8080
}
8181
}
@@ -91,7 +91,7 @@ impl AsRawFd for Listener {
9191
pub struct Context(pub(crate) Backend);
9292

9393
impl AsFd for Context {
94-
fn as_fd(&self) -> BorrowedFd {
94+
fn as_fd(&self) -> BorrowedFd<'_> {
9595
self.0.as_fd()
9696
}
9797
}

src/error.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@ impl fmt::Display for Error {
1717
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1818
match self {
1919
Self::UnexpectedHandshakeEvent => write!(f, "unexpected handshake event"),
20-
Self::InvalidInterfaceVersion(interface, version) => write!(
21-
f,
22-
"invalid version {} for interface '{}'",
23-
version, interface
24-
),
25-
Self::Event(err) => write!(f, "event error: {}", err),
26-
Self::Io(err) => write!(f, "IO error: {}", err),
27-
Self::Handshake(err) => write!(f, "handshake error: {}", err),
28-
Self::Parse(err) => write!(f, "parse error: {}", err),
20+
Self::InvalidInterfaceVersion(interface, version) => {
21+
write!(f, "invalid version {version} for interface '{interface}'")
22+
}
23+
Self::Event(err) => write!(f, "event error: {err}"),
24+
Self::Io(err) => write!(f, "IO error: {err}"),
25+
Self::Handshake(err) => write!(f, "handshake error: {err}"),
26+
Self::Parse(err) => write!(f, "parse error: {err}"),
2927
}
3028
}
3129
}

src/event.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ pub struct Seat(Arc<SeatInner>);
678678
impl fmt::Debug for Seat {
679679
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
680680
if let Some(name) = self.name() {
681-
write!(f, "Seat(\"{}\")", name)
681+
write!(f, "Seat(\"{name}\")")
682682
} else {
683683
write!(f, "Seat(None)")
684684
}
@@ -742,7 +742,7 @@ pub struct Device(Arc<DeviceInner>);
742742
impl fmt::Debug for Device {
743743
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
744744
if let Some(name) = self.name() {
745-
write!(f, "Device(\"{}\")", name)
745+
write!(f, "Device(\"{name}\")")
746746
} else {
747747
write!(f, "Device(None)")
748748
}

src/handshake.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pub enum HandshakeError {
4646
impl fmt::Display for HandshakeError {
4747
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
4848
match self {
49-
Self::InvalidObject(id) => write!(f, "invalid object {} during handshake", id),
49+
Self::InvalidObject(id) => write!(f, "invalid object {id} during handshake"),
5050
Self::NonHandshakeEvent => write!(f, "non-handshake event during handshake"),
5151
Self::MissingInterface => write!(f, "missing required interface"),
5252
Self::DuplicateEvent => write!(f, "duplicate event during handshake"),

src/request.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ impl Seat {
593593
impl fmt::Debug for Seat {
594594
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
595595
if let Some(name) = &self.0.name {
596-
write!(f, "Seat(\"{}\")", name)
596+
write!(f, "Seat(\"{name}\")")
597597
} else {
598598
write!(f, "Seat(None)")
599599
}
@@ -663,7 +663,7 @@ pub struct Device(Arc<DeviceInner>);
663663
impl fmt::Debug for Device {
664664
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
665665
if let Some(name) = self.name() {
666-
write!(f, "Device(\"{}\")", name)
666+
write!(f, "Device(\"{name}\")")
667667
} else {
668668
write!(f, "Device(None)")
669669
}

src/wire/backend.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ impl BackendWeak {
8888
}
8989

9090
impl AsFd for Backend {
91-
fn as_fd(&self) -> BorrowedFd {
91+
fn as_fd(&self) -> BorrowedFd<'_> {
9292
self.0.socket.as_fd()
9393
}
9494
}
@@ -287,7 +287,7 @@ impl Backend {
287287
eprint!(", ");
288288
}
289289
first = false;
290-
eprint!("{}", arg);
290+
eprint!("{arg}");
291291
}
292292
eprintln!(")");
293293
}

src/wire/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,19 +118,19 @@ impl fmt::Display for ParseError {
118118
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
119119
match self {
120120
Self::EndOfMessage => write!(f, "found end of message while parsing argument"),
121-
Self::Utf8(e) => write!(f, "invalid UTF-8 string in message: {}", e),
122-
Self::InvalidId(id) => write!(f, "new object id '{}' invalid", id),
121+
Self::Utf8(e) => write!(f, "invalid UTF-8 string in message: {e}"),
122+
Self::InvalidId(id) => write!(f, "new object id '{id}' invalid"),
123123
Self::NoFd => write!(f, "expected fd"),
124124
Self::InvalidOpcode(intr, op) => {
125-
write!(f, "opcode '{}' invallid for interface '{}'", op, intr)
125+
write!(f, "opcode '{op}' invallid for interface '{intr}'")
126126
}
127127
Self::InvalidVariant(enum_, var) => {
128-
write!(f, "variant '{}' invallid for enum '{}'", var, enum_)
128+
write!(f, "variant '{var}' invallid for enum '{enum_}'")
129129
}
130-
Self::InvalidInterface(intr) => write!(f, "unknown interface '{}'", intr),
131-
Self::HeaderLength(len) => write!(f, "header length {} < 16", len),
130+
Self::InvalidInterface(intr) => write!(f, "unknown interface '{intr}'"),
131+
Self::HeaderLength(len) => write!(f, "header length {len} < 16"),
132132
Self::MessageLength(a, b) => {
133-
write!(f, "message length didn't match header ({} != {})", a, b)
133+
write!(f, "message length didn't match header ({a} != {b})")
134134
}
135135
}
136136
}

0 commit comments

Comments
 (0)