Expressions: Since peg 0.8.0 [...] returns matched character

See kevinmehall/rust-peg#234
Mingun · Sep 6, 2024 · eb30135 · eb30135
1 parent 797786b
commit eb30135
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/parser/expressions.rs b/src/parser/expressions.rs
@@ -473,12 +473,12 @@ peg::parser! {
     rule EOS() = ![_];
 
     rule string() -> String
-      = "'" s:$([x if x != '\'']*) "'"  { s.to_owned() }
+      = "'" s:$([^ '\'']*)         "'"  { s.to_owned() }
       / "\"" v:(ch() / escaped())* "\"" { String::from_iter(v.into_iter()) }
       ;
 
     /// Single non-escaped character in string
-    rule ch() -> char = ch:$[^ '"' | '\\'] { ch.chars().next().unwrap() };
+    rule ch() -> char = [^ '"' | '\\'];
     /// One escaped character
     rule escaped() -> char = "\\" r:(quoted_char() / quoted_oct() / quoted_hex()) { r };
     /// Characters that can be escaped by backslash