Skip to content

Commit 3b60008

Browse files
committed
Remove unnecessary Result from seek(..)
1 parent b947287 commit 3b60008

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

src/lib.rs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ impl QueueFile {
666666
self.write_header(self.capacity, 0, 0, 0)?;
667667

668668
if self.overwrite_on_remove {
669-
self.inner.seek(self.header_len)?;
669+
self.inner.seek(self.header_len);
670670
let first_block = self.capacity.min(Self::BLOCK_LENGTH) - self.header_len;
671671
self.inner.write(&Self::ZEROES[..first_block as usize])?;
672672

@@ -801,7 +801,7 @@ impl QueueFile {
801801
header_buf.put_i32(last_pos as i32);
802802
}
803803

804-
self.inner.seek(0)?;
804+
self.inner.seek(0);
805805
self.inner.write(&header.as_ref()[..self.header_len as usize])
806806
}
807807

@@ -828,14 +828,14 @@ impl QueueFile {
828828
let pos = self.wrap_pos(pos);
829829

830830
if pos + self.write_buf.len() as u64 <= self.file_len() {
831-
self.inner.seek(pos)?;
831+
self.inner.seek(pos);
832832
self.inner.write(&self.write_buf)
833833
} else {
834834
let before_eof = (self.file_len() - pos) as usize;
835835

836-
self.inner.seek(pos)?;
836+
self.inner.seek(pos);
837837
self.inner.write(&self.write_buf[..before_eof])?;
838-
self.inner.seek(self.header_len)?;
838+
self.inner.seek(self.header_len);
839839
self.inner.write(&self.write_buf[before_eof..])
840840
}
841841
}
@@ -864,14 +864,14 @@ impl QueueFile {
864864
let pos = self.wrap_pos(pos);
865865

866866
if pos + buf.len() as u64 <= self.file_len() {
867-
self.inner.seek(pos)?;
867+
self.inner.seek(pos);
868868
self.inner.read(buf)
869869
} else {
870870
let before_eof = (self.file_len() - pos) as usize;
871871

872-
self.inner.seek(pos)?;
872+
self.inner.seek(pos);
873873
self.inner.read(&mut buf[..before_eof])?;
874-
self.inner.seek(self.header_len)?;
874+
self.inner.seek(self.header_len);
875875
self.inner.read(&mut buf[before_eof..])
876876
}
877877
}
@@ -933,9 +933,11 @@ impl QueueFile {
933933
impl QueueFileInner {
934934
const TRANSFER_BUFFER_SIZE: usize = 128 * 1024;
935935

936-
fn seek(&mut self, pos: u64) -> io::Result<u64> {
936+
#[inline]
937+
fn seek(&mut self, pos: u64) -> u64 {
937938
self.expected_seek = pos;
938-
Ok(pos)
939+
940+
pos
939941
}
940942

941943
fn real_seek(&mut self) -> io::Result<u64> {
@@ -1085,11 +1087,11 @@ impl QueueFileInner {
10851087
let mut bytes_left = count as i64;
10861088

10871089
while bytes_left > 0 {
1088-
self.seek(read_pos)?;
1090+
self.seek(read_pos);
10891091
let bytes_to_read = min(bytes_left as usize, Self::TRANSFER_BUFFER_SIZE);
10901092
self.read(&mut buf[..bytes_to_read])?;
10911093

1092-
self.seek(write_pos)?;
1094+
self.seek(write_pos);
10931095
self.write(&buf[..bytes_to_read])?;
10941096

10951097
read_pos += bytes_to_read as u64;

0 commit comments

Comments
 (0)