Clippy

JonathanBrouwer · Nov 5, 2023 · 25b7191 · 25b7191
1 parent d14d20b
commit 25b7191
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/prism-compiler/src/main.rs b/prism-compiler/src/main.rs
@@ -19,7 +19,7 @@ fn main() {
 
     let input = include_str!("../resources/program.pr");
     let expr: Result<_, _> = run_parser_rule(&grammar, "block", input, |r| {
-        Expr::from_action_result(&r, input)
+        Expr::from_action_result(r, input)
     });
     let expr = match expr {
         Ok(o) => o,

diff --git a/prism-parser/src/core/adaptive.rs b/prism-parser/src/core/adaptive.rs
@@ -108,6 +108,10 @@ pub struct RuleState<'b, 'grm> {
     pub arg_names: &'b Vec<&'grm str>,
 }
 
+pub enum UpdateError {
+    ToposortCycle,
+}
+
 impl<'b, 'grm> RuleState<'b, 'grm> {
     pub fn new_empty(name: &'grm str, arg_names: &'b Vec<&'grm str>) -> Self {
         Self {
@@ -122,7 +126,7 @@ impl<'b, 'grm> RuleState<'b, 'grm> {
         &mut self,
         r: &'b Rule<'grm, RuleAction<'b, 'grm>>,
         ctx: &Arc<HashMap<&'grm str, RuleId>>,
-    ) -> Result<(), ()> {
+    ) -> Result<(), UpdateError> {
         self.order.update(r);
 
         let order: HashMap<&'grm str, usize> = self

diff --git a/prism-parser/src/core/toposet.rs b/prism-parser/src/core/toposet.rs
@@ -1,3 +1,4 @@
+use crate::core::adaptive::UpdateError;
 use crate::grammar::Rule;
 use std::collections::hash_map::Entry;
 use std::collections::{HashMap, HashSet, VecDeque};
@@ -46,7 +47,7 @@ impl<'grm> TopoSet<'grm> {
         }
     }
 
-    pub fn toposort(&self) -> Result<Vec<&'grm str>, ()> {
+    pub fn toposort(&self) -> Result<Vec<&'grm str>, UpdateError> {
         let mut result = Vec::new();
         let mut counts: HashMap<&'grm str, usize> = HashMap::new();
 
@@ -79,7 +80,7 @@ impl<'grm> TopoSet<'grm> {
         if counts.is_empty() {
             Ok(result)
         } else {
-            Err(())
+            Err(UpdateError::ToposortCycle)
         }
     }
 }
diff --git a/prism-parser/src/grammar/from_action_result.rs b/prism-parser/src/grammar/from_action_result.rs
@@ -157,8 +157,8 @@ fn parse_rule_expr<'b, 'grm, A>(
     })
 }
 
-pub(crate) fn parse_identifier<'b, 'grm>(
-    r: &ActionResult<'b, 'grm>,
+pub(crate) fn parse_identifier<'grm>(
+    r: &ActionResult<'_, 'grm>,
     src: &'grm str,
 ) -> Option<&'grm str> {
     match r {

diff --git a/prism-parser/src/rule_action/from_action_result.rs b/prism-parser/src/rule_action/from_action_result.rs
@@ -18,7 +18,7 @@ pub fn parse_rule_action<'b, 'grm>(
             parse_identifier(&b[0], src)?,
             result_match! {
                 match &b[1].as_ref() => Construct(_, "List", subs),
-                create subs.iter().map(|sub| parse_rule_action(sub, src).map(|v| v)).collect::<Option<Vec<_>>>()?
+                create subs.iter().map(|sub| parse_rule_action(sub, src)).collect::<Option<Vec<_>>>()?
             }?,
         ),
         Construct(_, "InputLiteral", b) => RuleAction::InputLiteral(parse_string(&b[0], src)?),