Skip to content

Commit 5bdc021

Browse files
committed
chore: tidying up outstanding clippy lints
1 parent 75595a1 commit 5bdc021

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

crates/ninep/examples/server.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ impl Serve9p for EchoServer {
166166
RW => Ok(Stat {
167167
fm: FileMeta::file("rw", BAZ),
168168
perms: Perm::OWNER_READ | Perm::OWNER_WRITE,
169-
n_bytes: self.rw.as_bytes().len() as u64,
169+
n_bytes: self.rw.len() as u64,
170170
last_accesses: SystemTime::now(),
171171
last_modified: SystemTime::now(),
172172
owner: uname.into(),
@@ -269,7 +269,7 @@ impl Serve9p for EchoServer {
269269
Stat {
270270
fm: FileMeta::file("rw", RW),
271271
perms: Perm::OWNER_READ | Perm::OWNER_WRITE,
272-
n_bytes: self.rw.as_bytes().len() as u64,
272+
n_bytes: self.rw.len() as u64,
273273
last_accesses: SystemTime::now(),
274274
last_modified: SystemTime::now(),
275275
owner: uname.into(),

crates/ninep/src/server.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -820,11 +820,7 @@ where
820820
match outcome {
821821
ReadOutcome::Immediate(data) => data,
822822
ReadOutcome::Blocked(chan) => {
823-
// Cloning the stream can
824-
let mut stream = match self.stream.try_clone() {
825-
Ok(stream) => stream,
826-
Err(err) => return Err(err),
827-
};
823+
let mut stream = self.stream.try_clone()?;
828824

829825
spawn(move || {
830826
let data = chan.recv().unwrap_or_default();

src/fsys/buffer.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ impl BufferNode {
366366
trace!(id=%self.id, %fname, "refreshing file stat");
367367
let content = self.current_file_content_as_string(fname, tx)?;
368368
let stat = self.file_stats.get_mut(fname)?;
369-
stat.n_bytes = content.as_bytes().len() as u64;
369+
stat.n_bytes = content.len() as u64;
370370

371371
Some(stat.clone())
372372
}

src/ziplist.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,7 @@ impl<T> ZipList<T> {
115115
I: IntoIterator<Item = T>,
116116
{
117117
let mut it = iter.into_iter();
118-
119-
let focus = match it.next() {
120-
Some(t) => t,
121-
None => return None,
122-
};
118+
let focus = it.next()?;
123119

124120
Some(Self {
125121
up: VecDeque::default(),

0 commit comments

Comments
 (0)