Skip to content

Commit f1eefd2

Browse files
committed
Fix clippy w/e
1 parent 5c110fb commit f1eefd2

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

src/ip_addr.rs

+7-6
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ where
103103
(is(b'2'), is(b'5'), to_digit)
104104
.try_map(|(_, _, c)| {
105105
250u8
106-
.checked_add(u8::from(c))
106+
.checked_add(c)
107107
.ok_or_else(|| Context::new(IpAddrAtom::NotAnOctet))
108108
})
109109
.parse(stream)
@@ -116,7 +116,7 @@ where
116116
(is(b'2'), to_digit, to_digit)
117117
.try_map(|(_, b, c)| {
118118
200u8
119-
.checked_add(u8::from(b) * 10 + u8::from(c))
119+
.checked_add(b * 10 + c)
120120
.ok_or_else(|| Context::new(IpAddrAtom::NotAnOctet))
121121
})
122122
.parse(stream)
@@ -129,7 +129,7 @@ where
129129
(is(b'1'), to_digit, to_digit)
130130
.try_map(|(_, b, c)| {
131131
100u8
132-
.checked_add(u8::from(b) * 10 + u8::from(c))
132+
.checked_add(b * 10 + c)
133133
.ok_or_else(|| Context::new(IpAddrAtom::NotAnOctet))
134134
})
135135
.parse(stream)
@@ -141,8 +141,6 @@ where
141141
{
142142
(to_digit, to_digit)
143143
.try_map(|(a, b)| {
144-
let a = u8::from(a);
145-
let b = u8::from(b);
146144
if a == 0 {
147145
Err(Context::new(IpAddrAtom::LeadingZero))
148146
} else {
@@ -448,7 +446,10 @@ where
448446
.and(colon_h16)
449447
.or(ipv4_address.map(|ipv4| {
450448
let [a, b, c, d] = ipv4.octets();
451-
((a as u16) << 8 | (b as u16), (c as u16) << 8 | (d as u16))
449+
(
450+
(a as u16) << 8u16 | (b as u16),
451+
(c as u16) << 8u16 | (d as u16),
452+
)
452453
}))
453454
.parse(stream)
454455
}

src/tcp.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,18 @@ macro_rules! tcp_flags {
104104
}
105105

106106
tcp_flags! {
107-
reserved_0 => 11,
108-
reserved_1 => 10,
109-
reserved_2 => 9,
110-
ns => 8,
111-
cwr => 7,
112-
ece => 6,
113-
urg => 5,
114-
ack => 4,
115-
psh => 3,
116-
rst => 2,
117-
syn => 1,
118-
fin => 0,
107+
reserved_0 => 11u16,
108+
reserved_1 => 10u16,
109+
reserved_2 => 9u16,
110+
ns => 8u16,
111+
cwr => 7u16,
112+
ece => 6u16,
113+
urg => 5u16,
114+
ack => 4u16,
115+
psh => 3u16,
116+
rst => 2u16,
117+
syn => 1u16,
118+
fin => 0u16,
119119
}
120120

121121
impl From<u16> for TcpFlags {

0 commit comments

Comments
 (0)