Skip to content

Commit f150f55

Browse files
fogtimkroening
andcommitted
refactor(mem/fs): use match instead of if/else
Co-authored-by: Martin Kröning <[email protected]>
1 parent 888138f commit f150f55

File tree

1 file changed

+20
-22
lines changed

1 file changed

+20
-22
lines changed

src/fs/mem.rs

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,17 @@ impl ObjectInterface for RomFileInterface {
9696
let guard = self.inner.read().await;
9797
let mut pos_guard = self.pos.lock().await;
9898

99-
let new_pos: isize = if whence == SeekWhence::Set {
100-
if offset < 0 {
101-
return Err(Errno::Inval);
102-
}
99+
let new_pos = match whence {
100+
SeekWhence::Set => {
101+
if offset < 0 {
102+
return Err(Errno::Inval);
103+
}
103104

104-
offset
105-
} else if whence == SeekWhence::End {
106-
guard.data.len() as isize + offset
107-
} else if whence == SeekWhence::Cur {
108-
(*pos_guard as isize) + offset
109-
} else {
110-
return Err(Errno::Inval);
105+
offset
106+
}
107+
SeekWhence::Cur => (*pos_guard as isize) + offset,
108+
SeekWhence::End => guard.data.len() as isize + offset,
109+
_ => return Err(Errno::Inval),
111110
};
112111

113112
if new_pos <= isize::try_from(guard.data.len()).unwrap() {
@@ -229,18 +228,17 @@ impl ObjectInterface for RamFileInterface {
229228
let mut guard = self.inner.write().await;
230229
let mut pos_guard = self.pos.lock().await;
231230

232-
let new_pos: isize = if whence == SeekWhence::Set {
233-
if offset < 0 {
234-
return Err(Errno::Inval);
235-
}
231+
let new_pos = match whence {
232+
SeekWhence::Set => {
233+
if offset < 0 {
234+
return Err(Errno::Inval);
235+
}
236236

237-
offset
238-
} else if whence == SeekWhence::End {
239-
guard.data.len() as isize + offset
240-
} else if whence == SeekWhence::Cur {
241-
(*pos_guard as isize) + offset
242-
} else {
243-
return Err(Errno::Inval);
237+
offset
238+
}
239+
SeekWhence::Cur => (*pos_guard as isize) + offset,
240+
SeekWhence::End => guard.data.len() as isize + offset,
241+
_ => return Err(Errno::Inval),
244242
};
245243

246244
if new_pos > isize::try_from(guard.data.len()).unwrap() {

0 commit comments

Comments
 (0)