GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-20 06:52:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix new Clippy lints

Browse source
This commit is contained in:
Damien Elmes 2020-11-25 09:12:19 +10:00
parent 9d0b3759fc
commit 780f32b8ae
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rslib/src/search/parser.rs
View file

@ -414,16 +414,16 @@ fn parse_template(val: &str) -> ParseResult<SearchNode> {
} }
fn parse_single_field<'a>(key: &'a str, val: &'a str) -> ParseResult<SearchNode<'a>> { fn parse_single_field<'a>(key: &'a str, val: &'a str) -> ParseResult<SearchNode<'a>> {
Ok(if val.starts_with("re:") { Ok(if let Some(stripped) = val.strip_prefix("re:") {
SearchNode::SingleField { SearchNode::SingleField {
field: unescape(key)?, field: unescape(key)?,
text: unescape_quotes(&val[3..]), text: unescape_quotes(stripped),
is_re: true, is_re: true,
} }
} else if val.starts_with("r:") { } else if let Some(stripped) = val.strip_prefix("r:") {
SearchNode::SingleField { SearchNode::SingleField {
field: unescape(key)?, field: unescape(key)?,
text: unescape_raw(&val[2..]), text: unescape_raw(stripped),
is_re: false, is_re: false,
} }
} else { } else {

16
rslib/src/template.rs
View file

@ -90,12 +90,12 @@ fn classify_handle(s: &str) -> Token {
if start.len() < 2 { if start.len() < 2 {
return Token::Replacement(start); return Token::Replacement(start);
} }
if start.starts_with('#') { if let Some(stripped) = start.strip_prefix('#') {
Token::OpenConditional(&start[1..].trim_start()) Token::OpenConditional(stripped.trim_start())
} else if start.starts_with('/') { } else if let Some(stripped) = start.strip_prefix('/') {
Token::CloseConditional(&start[1..].trim_start()) Token::CloseConditional(stripped.trim_start())
} else if start.starts_with('^') { } else if let Some(stripped) = start.strip_prefix('^') {
Token::OpenNegated(&start[1..].trim_start()) Token::OpenNegated(stripped.trim_start())
} else { } else {
Token::Replacement(start) Token::Replacement(start)
} }
@ -116,9 +116,9 @@ fn legacy_text_token(s: &str) -> nom::IResult<&str, Token> {
// if we locate a starting normal or alternate handlebar, use // if we locate a starting normal or alternate handlebar, use
// whichever one we found first // whichever one we found first
let normal_result: nom::IResult<&str, &str> = take_until("{{")(s); let normal_result: nom::IResult<&str, &str> = take_until("{{")(s);
let (normal_remaining, normal_span) = normal_result.unwrap_or_else(|_e| ("", s)); let (normal_remaining, normal_span) = normal_result.unwrap_or(("", s));
let alt_result: nom::IResult<&str, &str> = take_until("<%")(s); let alt_result: nom::IResult<&str, &str> = take_until("<%")(s);
let (alt_remaining, alt_span) = alt_result.unwrap_or_else(|_e| ("", s)); let (alt_remaining, alt_span) = alt_result.unwrap_or(("", s));
match (normal_span.len(), alt_span.len()) { match (normal_span.len(), alt_span.len()) {
(0, 0) => { (0, 0) => {
// neither handlebar kind found // neither handlebar kind found