From 3343b698aa106b62ede36eb805951b11087d33c9 Mon Sep 17 00:00:00 2001 From: Aravinth Manivannan Date: Sun, 19 Feb 2023 20:08:50 +0530 Subject: [PATCH] chore: linting --- build.rs | 2 +- src/post.rs | 46 +++++++++++++++++----------------------------- src/settings.rs | 2 +- 3 files changed, 19 insertions(+), 31 deletions(-) diff --git a/build.rs b/build.rs index e31dab0..5099983 100644 --- a/build.rs +++ b/build.rs @@ -18,7 +18,7 @@ use std::process::Command; fn main() { let output = Command::new("git") - .args(&["rev-parse", "HEAD"]) + .args(["rev-parse", "HEAD"]) .output() .expect("error in git command, is git installed?"); let git_hash = String::from_utf8(output.stdout).unwrap(); diff --git a/src/post.rs b/src/post.rs index 11450e4..2c6a9aa 100644 --- a/src/post.rs +++ b/src/post.rs @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -use std::{collections::HashMap, hash::Hash}; +use std::collections::HashMap; use crate::data::*; use crate::proxy::StringUtils; @@ -26,20 +26,12 @@ enum PostitionType { End, } +#[derive(Default, Eq, PartialEq)] struct ListState { in_uli: bool, in_oli: bool, } -impl Default for ListState { - fn default() -> Self { - Self { - in_uli: false, - in_oli: false, - } - } -} - struct Markup<'a, 'b> { markup: &'a GetPostPostContentBodyModelParagraphsMarkups, p: &'a GetPostPostContentBodyModelParagraphs, @@ -233,22 +225,18 @@ impl<'a, 'b> Markup<'a, 'b> { p: &GetPostPostContentBodyModelParagraphs, state: &mut ListState, ) -> Option { - if state.in_oli { - if p.type_ != "OLI" { - state.in_oli = false; - return Some(format!("")); - } + if state.in_oli && p.type_ != "OLI" { + state.in_oli = false; + return Some("".to_string()); }; - if state.in_uli { - if p.type_ != "ULI" { - state.in_uli = false; - return Some(format!("")); - } + if state.in_uli && p.type_ != "ULI" { + state.in_uli = false; + return Some("".to_string()); }; None } - fn apply_markup(&self, pindex: usize) -> String { + fn apply_markup(&self, _pindex: usize) -> String { if self.markup.type_ == "A" { if let Some(anchor_type) = &self.markup.anchor_type { if anchor_type == "LINK" { @@ -351,9 +339,9 @@ impl<'a, 'b> PositionMap<'a, 'b> { } } -pub fn apply_markup<'b>( +pub fn apply_markup( data: &PostResp, - gists: &'b Option>, + gists: &Option>, ) -> Vec { let mut paragraphs: Vec = Vec::with_capacity(data.content.body_model.paragraphs.len()); let mut state = ListState::default(); @@ -365,14 +353,14 @@ pub fn apply_markup<'b>( } for m in p.markups.iter() { let start_markup = Markup { - markup: &m, + markup: m, p, gists, pos_type: PostitionType::Start, }; pos.insert_if_not_exists(m.start, start_markup); let end_markup = Markup { - markup: &m, + markup: m, p, gists, pos_type: PostitionType::End, @@ -395,9 +383,9 @@ pub fn apply_markup<'b>( } let mut content = String::with_capacity(p.text.len()); - content += &Markup::start(&p, &gists, pindex, &mut state); + content += &Markup::start(p, gists, pindex, &mut state); pos.arr.sort(); - if let Some(first) = pos.arr.get(0) { + if let Some(first) = pos.arr.first() { //content += p.text.substring(cur, *first as usize); content += p.text.slice(cur..*first as usize); cur = incr_cur(cur, *first); @@ -418,11 +406,11 @@ pub fn apply_markup<'b>( } log::debug!("LAST"); content += p.text.slice(cur..); - content += &Markup::end(&p, pindex, &mut state); + content += &Markup::end(p, pindex, &mut state); } else { log::debug!("LAST WITH NO MARKUP"); content += p.text.slice(cur..); - content += &Markup::end(&p, pindex, &mut state); + content += &Markup::end(p, pindex, &mut state); } paragraphs.push(content); } diff --git a/src/settings.rs b/src/settings.rs index 865ebc1..3976fc1 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -95,7 +95,7 @@ impl Settings { let cache_path = settings.cache.as_ref().unwrap(); let cache_path = Path::new(&cache_path); if !cache_path.exists() { - fs::create_dir(&cache_path).unwrap(); + fs::create_dir(cache_path).unwrap(); } if !cache_path.is_dir() { panic!(