Fix review nits

ethereum · Apr 6, 2024 · 273ce09 · 273ce09
1 parent e8ff942
commit 273ce09
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 24 deletions.
diff --git a/crates/parser2/src/ast/item.rs b/crates/parser2/src/ast/item.rs
@@ -728,7 +728,6 @@ mod tests {
         let u: Use = parse_item(source);
         let use_tree = u.use_tree().unwrap();
         let mut count = 0;
-        dbg!(use_tree.path().unwrap());
         for segment in use_tree.path().unwrap() {
             match count {
                 0 => {

diff --git a/crates/parser2/src/parser/expr_atom.rs b/crates/parser2/src/parser/expr_atom.rs
@@ -1,6 +1,7 @@
 use std::convert::Infallible;
 
 use rowan::Checkpoint;
+use unwrap_infallible::UnwrapInfallible;
 
 use crate::{
     parser::{lit, path},
@@ -40,9 +41,9 @@ pub(super) fn parse_expr_atom<S: TokenStream>(
         Some(LBrace) => parser.parse_cp(BlockExprScope::default(), None),
         Some(LParen) => parser.parse_cp(ParenScope::default(), None),
         Some(LBracket) => parser.parse_cp(ArrayScope::default(), None),
-        Some(kind) if lit::is_lit(kind) => parser
+        Some(kind) if lit::is_lit(kind) => Ok(parser
             .parse_cp(LitExprScope::default(), None)
-            .map_err(|e| e.into()),
+            .unwrap_infallible()),
         Some(kind) if path::is_path_segment(kind) => {
             parser.parse_cp(PathExprScope::new(allow_record_init), None)
         }

diff --git a/crates/parser2/src/parser/mod.rs b/crates/parser2/src/parser/mod.rs
@@ -34,7 +34,6 @@ pub struct Parser<S: TokenStream> {
     stream: BackTrackableTokenStream<S>,
 
     builder: rowan::GreenNodeBuilder<'static>,
-    /// The second element holds `is_newline_trivia` of the parent.
     parents: Vec<ScopeEntry>,
     errors: Vec<ParseError>,
 
@@ -641,18 +640,6 @@ impl Recovery<()> {
 #[derive(Debug)]
 pub struct ErrProof(());
 
-impl<T> From<Infallible> for Recovery<T> {
-    fn from(_value: Infallible) -> Self {
-        unreachable!()
-    }
-}
-
-impl From<Recovery<ErrProof>> for Recovery<()> {
-    fn from(r: Recovery<ErrProof>) -> Self {
-        Recovery(r.0, ())
-    }
-}
-
 pub trait Recoverable {
     fn is_local_recovery<S: TokenStream>(&self, _parser: &Parser<S>) -> bool {
         false

diff --git a/crates/parser2/src/parser/param.rs b/crates/parser2/src/parser/param.rs
@@ -1,5 +1,7 @@
 use std::convert::Infallible;
 
+use unwrap_infallible::UnwrapInfallible;
+
 use crate::{ExpectedKind, ParseError, SyntaxKind};
 
 use super::{
@@ -224,7 +226,9 @@ fn parse_kind_bound<S: TokenStream>(parser: &mut Parser<S>) -> Result<(), Recove
             parser.bump();
         }
     } else if parser.current_kind() == Some(SyntaxKind::Star) {
-        parser.parse(KindBoundMonoScope::default())?;
+        parser
+            .parse(KindBoundMonoScope::default())
+            .unwrap_infallible();
     } else {
         // guaranteed by `expected`, unless other recovery
         // other tokens are added to the current scope
@@ -309,7 +313,7 @@ impl super::Parse for GenericArgScope {
 
             Some(kind) if kind.is_literal_leaf() => {
                 self.set_kind(SyntaxKind::ConstGenericArg);
-                parser.parse(LitExprScope::default())?;
+                parser.parse(LitExprScope::default()).unwrap_infallible();
             }
 
             _ => {

diff --git a/crates/parser2/src/parser/stmt.rs b/crates/parser2/src/parser/stmt.rs
@@ -1,5 +1,7 @@
 use std::convert::Infallible;
 
+use unwrap_infallible::UnwrapInfallible;
+
 use crate::{ExpectedKind, SyntaxKind};
 
 use super::{
@@ -19,12 +21,16 @@ pub fn parse_stmt<S: TokenStream>(parser: &mut Parser<S>) -> Result<(), Recovery
         Some(LetKw) => parser.parse(LetStmtScope::default()),
         Some(ForKw) => parser.parse(ForStmtScope::default()),
         Some(WhileKw) => parser.parse(WhileStmtScope::default()),
-        Some(ContinueKw) => parser
-            .parse(ContinueStmtScope::default())
-            .map_err(|e| e.into()),
-        Some(BreakKw) => parser
-            .parse(BreakStmtScope::default())
-            .map_err(|e| e.into()),
+        Some(ContinueKw) => {
+            parser
+                .parse(ContinueStmtScope::default())
+                .unwrap_infallible();
+            Ok(())
+        }
+        Some(BreakKw) => {
+            parser.parse(BreakStmtScope::default()).unwrap_infallible();
+            Ok(())
+        }
         Some(ReturnKw) => parser.parse(ReturnStmtScope::default()),
         _ => parser.parse(ExprStmtScope::default()),
     }