From: Skgland Date: Sat, 6 Feb 2021 18:53:53 +0000 (+0100) Subject: more clippy lints X-Git-Tag: v0.9.0~150^2~65^2~6^2~4 X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=1eb9fcf521e797c3132041a21352f9bc7e635232;p=scryer-prolog.git more clippy lints --- diff --git a/crates/prolog_parser/src/ast.rs b/crates/prolog_parser/src/ast.rs index 6b7534cf..2f976a0e 100644 --- a/crates/prolog_parser/src/ast.rs +++ b/crates/prolog_parser/src/ast.rs @@ -698,7 +698,7 @@ impl ClauseName { impl AsRef for ClauseName { #[inline] - fn as_ref(self: &Self) -> &str { + fn as_ref(&self) -> &str { self.as_str() } } diff --git a/crates/prolog_parser/src/parser.rs b/crates/prolog_parser/src/parser.rs index b67924c0..60cebc90 100644 --- a/crates/prolog_parser/src/parser.rs +++ b/crates/prolog_parser/src/parser.rs @@ -195,7 +195,7 @@ pub struct Parser<'a, R: Read> { terms: Vec, } -fn read_tokens<'a, R: Read>(lexer: &mut Lexer<'a, R>) -> Result, ParserError> { +fn read_tokens(lexer: &mut Lexer) -> Result, ParserError> { let mut tokens = vec![]; loop { @@ -872,11 +872,8 @@ impl<'a, R: Read> Parser<'a, R> { fn shift_token(&mut self, token: Token, op_dir: &CompositeOpDir) -> Result<(), ParserError> { fn negate_rc(mut t: Rc) -> Rc { - match Rc::get_mut(&mut t) { - Some(t) => { - t.neg_assign(); - } - None => {} + if let Some(t) = Rc::get_mut(&mut t) { + t.neg_assign(); }; t