Skip to content

Commit c7eedcc

Browse files
committed
Fix some Clippy warnings
1 parent abce729 commit c7eedcc

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

build.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ fn gen_uring_ops() -> Result<String, Box<dyn std::error::Error>> {
5252
.lines()
5353
.map(|line| line.unwrap())
5454
.filter_map(|line| line.strip_prefix("_S(").map(String::from))
55-
.filter_map(|line| line.strip_suffix(")").map(String::from))
55+
.filter_map(|line| line.strip_suffix(')').map(String::from))
5656
.filter_map(|line| {
57-
line.as_str().split_once(",").map(|(k, v)| {
57+
line.as_str().split_once(',').map(|(k, v)| {
5858
(
5959
k.trim().to_string(),
6060
v.trim_matches(|c: char| c.is_whitespace() || c == '"')

src/json.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ impl<'de, R: Read> de::Deserializer<'de> for &mut Deserializer<R> {
146146
pub fn from_reader<'de, R, T>(reader: R) -> serde_json::Result<T>
147147
where
148148
R: Read,
149-
T: ?Sized + de::Deserialize<'de>,
149+
T: de::Deserialize<'de>,
150150
{
151151
let mut d = crate::json::Deserializer::new(reader);
152152
de::Deserialize::deserialize(&mut d)

src/proc.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ impl FromStr for ProcessKey {
6464
type Err = ParseProcessKeyError;
6565
fn from_str(s: &str) -> Result<Self, Self::Err> {
6666
if let Some(s) = s.strip_prefix("id[") {
67-
let s = s.strip_suffix("]").ok_or(ParseProcessKeyError::Format)?;
67+
let s = s.strip_suffix(']').ok_or(ParseProcessKeyError::Format)?;
6868
Ok(ProcessKey::Event(
6969
s.parse().map_err(ParseProcessKeyError::ID)?,
7070
))
7171
} else if let Some(s) = s.strip_prefix("ob[") {
72-
let s = s.strip_suffix("]").ok_or(ParseProcessKeyError::Format)?;
73-
let (msec, pid) = s.split_once(",").ok_or(ParseProcessKeyError::Format)?;
72+
let s = s.strip_suffix(']').ok_or(ParseProcessKeyError::Format)?;
73+
let (msec, pid) = s.split_once(',').ok_or(ParseProcessKeyError::Format)?;
7474
let time = msec.parse().map_err(ParseProcessKeyError::Int)?;
7575
let pid = pid.parse().map_err(ParseProcessKeyError::Int)?;
7676
Ok(ProcessKey::Observed { time, pid })
@@ -435,7 +435,7 @@ impl ProcTable {
435435
};
436436
}
437437
for pk in chain.iter().rev() {
438-
self.relabel_process(pk, &settings);
438+
self.relabel_process(pk, settings);
439439
}
440440
}
441441
}

src/sockaddr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ impl SocketAddr {
115115
let sa = get_sock::<sockaddr_in>(buf)?;
116116
Ok(SocketAddr::Inet(SocketAddrV4::new(
117117
Ipv4Addr::from(u32::from_be(sa.sin_addr.s_addr)),
118-
u16::from_be(sa.sin_port as u16),
118+
u16::from_be(sa.sin_port),
119119
)))
120120
}
121121
AF_AX25 => {
@@ -156,7 +156,7 @@ impl SocketAddr {
156156
let addr = unsafe { sa.sin6_addr.in6_u.u6_addr8 };
157157
Ok(SocketAddr::Inet6(SocketAddrV6::new(
158158
Ipv6Addr::from(addr),
159-
u16::from_be(sa.sin6_port as u16),
159+
u16::from_be(sa.sin6_port),
160160
u32::from_be(sa.sin6_flowinfo),
161161
sa.sin6_scope_id,
162162
)))

src/userdb.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pub(crate) struct UserDB {
4646
}
4747

4848
fn now() -> i64 {
49-
unsafe { libc::time(std::ptr::null_mut()) as i64 }
49+
unsafe { libc::time(std::ptr::null_mut()) }
5050
}
5151

5252
impl UserDB {

0 commit comments

Comments
 (0)