Fix clippy lints after update

VHDL-LS · Sep 21, 2024 · b06da00 · b06da00
1 parent 098c1c7
commit b06da00
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 18 deletions.
diff --git a/vhdl_lang/src/analysis/design_unit.rs b/vhdl_lang/src/analysis/design_unit.rs
@@ -408,10 +408,7 @@ impl<'a, 't> AnalyzeContext<'a, 't> {
                     &ent_name_span.pos(self.ctx),
                     &designator.item,
                 )
-                .map(|design| {
-                    designator.set_unique_reference(design.into());
-                    design
-                })?),
+                .inspect(|design| designator.set_unique_reference(design.0))?),
 
             // configuration cfg of lib.ent
             Name::Selected(ref mut prefix, ref mut designator) => {

diff --git a/vhdl_lang/src/analysis/names.rs b/vhdl_lang/src/analysis/names.rs
@@ -1481,12 +1481,8 @@ impl<'a, 't> AnalyzeContext<'a, 't> {
                             designator.pos(self.ctx),
                             &designator.item.item,
                         )
-                        .map(|design| {
-                            designator
-                                .item
-                                .reference
-                                .set_unique_reference(design.into());
-                            design
+                        .inspect(|design| {
+                            designator.item.reference.set_unique_reference(design.0)
                         })?,
                     );
                 } else {

diff --git a/vhdl_lang/src/syntax/expression.rs b/vhdl_lang/src/syntax/expression.rs
@@ -554,10 +554,7 @@ fn parse_expr(
 ///   8. misc_operator: ** | abs | not
 pub fn parse_expression(ctx: &mut ParsingContext<'_>) -> ParseResult<WithTokenSpan<Expression>> {
     let state = ctx.stream.state();
-    parse_expr(ctx, 0).map_err(|err| {
-        ctx.stream.set_state(state);
-        err
-    })
+    parse_expr(ctx, 0).inspect_err(|_| ctx.stream.set_state(state))
 }
 
 #[cfg(test)]

diff --git a/vhdl_lang/src/syntax/names.rs b/vhdl_lang/src/syntax/names.rs
@@ -550,10 +550,7 @@ pub fn into_range(assoc: AssociationElement) -> Result<ast::Range, AssociationEl
 
 pub fn parse_name(ctx: &mut ParsingContext<'_>) -> ParseResult<WithTokenSpan<Name>> {
     let state = ctx.stream.state();
-    _parse_name(ctx).map_err(|err| {
-        ctx.stream.set_state(state);
-        err
-    })
+    _parse_name(ctx).inspect_err(|_| ctx.stream.set_state(state))
 }
 
 #[cfg(test)]