From 0bc666d23d626d154c452d5a6d673547f6378a1b Mon Sep 17 00:00:00 2001 From: yonip23 <67855609+yonip23@users.noreply.github.com> Date: Mon, 18 Jan 2021 20:33:24 +0200 Subject: [PATCH 1/2] Create clippy-fmt.yml --- .github/workflows/clippy-fmt.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/clippy-fmt.yml diff --git a/.github/workflows/clippy-fmt.yml b/.github/workflows/clippy-fmt.yml new file mode 100644 index 0000000..084d0ee --- /dev/null +++ b/.github/workflows/clippy-fmt.yml @@ -0,0 +1,23 @@ +on: [push, pull_request] +name: Clippy & Fmt +jobs: + clippy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + components: clippy + - name: Cargo Clippy Check + uses: actions-rs/clippy@master + with: + args: --all-features --all-targets -- -D warnings + fmt: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Cargo Fmt Check + uses: icepuma/rust-action@master + with: + args: cargo fmt --all -- --check From 1686e17df3ff14b8888e7f31c756fa36dec3748a Mon Sep 17 00:00:00 2001 From: yonip23 Date: Mon, 18 Jan 2021 20:41:45 +0200 Subject: [PATCH 2/2] fixing clippy warnings --- commit_log/src/lib.rs | 10 +++++----- commit_log/src/reader.rs | 2 +- commit_log/src/segment/index.rs | 8 +++++--- commit_log/src/segment/log.rs | 2 +- commit_log/src/segment/mod.rs | 4 ++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/commit_log/src/lib.rs b/commit_log/src/lib.rs index bf52565..8c6ca9b 100644 --- a/commit_log/src/lib.rs +++ b/commit_log/src/lib.rs @@ -99,10 +99,10 @@ impl CommitLog { let segments = vec![Segment::new(path.clone(), 0, segment_size, index_size)?]; Ok(Self { - path: path, - segments: segments, - segment_size: segment_size, - index_size: index_size, + path, + segments, + segment_size, + index_size, current_segment: 0, }) } @@ -146,7 +146,7 @@ impl CommitLog { } pub fn read(&mut self, position: &Position) -> Result { - return self.read_after(position, 0); + self.read_after(position, 0) } fn rotate_segment(&mut self) -> Result<(), Error> { diff --git a/commit_log/src/reader.rs b/commit_log/src/reader.rs index 67f58e8..511ddf0 100644 --- a/commit_log/src/reader.rs +++ b/commit_log/src/reader.rs @@ -25,7 +25,7 @@ impl<'a> Reader<'a> { let segment_index = record.segment_index; let total_segments = self.commit_log.segments.len(); if segment_index >= total_segments { - return Err(Error::InvalidPosition); + Err(Error::InvalidPosition) } else { let segment = &self.commit_log.segments[segment_index]; let buf = segment.read_at(record.current_offset)?; diff --git a/commit_log/src/segment/index.rs b/commit_log/src/segment/index.rs index 945bf5a..540caf5 100644 --- a/commit_log/src/segment/index.rs +++ b/commit_log/src/segment/index.rs @@ -8,6 +8,7 @@ use std::path::PathBuf; use std::str::from_utf8_unchecked; use derive_more::From; +use std::fmt; #[derive(Debug, From)] pub enum Error { @@ -156,10 +157,11 @@ impl Entry { pub fn new(offset: usize, size: usize) -> Self { Self { offset, size } } +} - /// Convert an entry to string - pub fn to_string(&self) -> String { - format!("{:010}{:010}", self.offset, self.size) +impl fmt::Display for Entry { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "{:010}{:010}", self.offset, self.size) } } diff --git a/commit_log/src/segment/log.rs b/commit_log/src/segment/log.rs index 60928dc..208b7d5 100644 --- a/commit_log/src/segment/log.rs +++ b/commit_log/src/segment/log.rs @@ -76,7 +76,7 @@ impl Log { base_offset, offset, max_size, - mmap: mmap, + mmap, }) } diff --git a/commit_log/src/segment/mod.rs b/commit_log/src/segment/mod.rs index 258e9e9..c8df54e 100644 --- a/commit_log/src/segment/mod.rs +++ b/commit_log/src/segment/mod.rs @@ -55,8 +55,8 @@ impl Segment { ) -> Result { Ok(Self { log: Log::new(path.clone(), offset, max_log_size)?, - index: Index::new(path.clone(), offset, max_index_size)?, - offset: offset, + index: Index::new(path, offset, max_index_size)?, + offset, }) }