Clippy fix.

ethereum · Oct 1, 2021 · 7b05ac4 · 7b05ac4
1 parent 4d5bc24
commit 7b05ac4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/crates/parser/src/ast.rs b/crates/parser/src/ast.rs
@@ -429,7 +429,7 @@ impl fmt::Display for Path {
         let joined_names = self
             .names
             .iter()
-            .map(|name| format!("{}", name.kind))
+            .map(|name| name.kind.to_string())
             .collect::<Vec<_>>()
             .join("::");
         write!(f, "{}", joined_names)?;

diff --git a/crates/parser/src/grammar/module.rs b/crates/parser/src/grammar/module.rs
@@ -169,23 +169,21 @@ pub fn parse_use_tree(par: &mut Parser) -> ParseResult<Node<UseTree>> {
                     "failed to parse `use` tree",
                     vec!["Note: expected a `*`, `{` or name token".to_string()],
                 );
-                return Err(ParseFailed);
+                Err(ParseFailed)
             }
         }
-    } else {
-        if par.peek() == Some(TokenKind::As) {
-            par.next()?;
+    } else if par.peek() == Some(TokenKind::As) {
+        par.next()?;
 
-            let rename_tok = par.expect(TokenKind::Name, "failed to parse `use` tree")?;
-            let rename = Some(Node::new(rename_tok.text.to_string(), rename_tok.span));
+        let rename_tok = par.expect(TokenKind::Name, "failed to parse `use` tree")?;
+        let rename = Some(Node::new(rename_tok.text.to_string(), rename_tok.span));
 
-            Ok(Node::new(
-                UseTree::Simple { path, rename },
-                path_span + rename_tok.span,
-            ))
-        } else {
-            Ok(Node::new(UseTree::Simple { path, rename: None }, path_span))
-        }
+        Ok(Node::new(
+            UseTree::Simple { path, rename },
+            path_span + rename_tok.span,
+        ))
+    } else {
+        Ok(Node::new(UseTree::Simple { path, rename: None }, path_span))
     }
 }