talexander/organic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Cleanup.

Browse Source
This commit is contained in:
Tom Alexander 2022-12-18 03:04:18 -05:00
parent 54ed989300
commit 46672b40b2
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/parser/list.rs
View File

@ -26,7 +26,6 @@ impl<T> Node<T> {
} }
} }
// TODO: This Debug is only needed because of the try_unwrap+expect
impl<T> List<T> { impl<T> List<T> {
pub fn new() -> Self { pub fn new() -> Self {
List { head: None } List { head: None }
@ -47,7 +46,7 @@ impl<T> List<T> {
Some(popped_node) => { Some(popped_node) => {
let extracted_node = match Rc::try_unwrap(popped_node) { let extracted_node = match Rc::try_unwrap(popped_node) {
Ok(node) => node, Ok(node) => node,
Err(e) => panic!("try_unwrap failed on Rc in pop_front on List."), Err(_) => panic!("try_unwrap failed on Rc in pop_front on List."),
}; };
( (
Some(extracted_node.data), Some(extracted_node.data),

4
src/parser/parser_context.rs
View File

@ -4,13 +4,13 @@ use nom::IResult;
use super::error::CustomError; use super::error::CustomError;
use super::error::MyError; use super::error::MyError;
use super::error::Res;
use super::list::List; use super::list::List;
use super::list::Node; use super::list::Node;
use super::token::Token; use super::token::Token;
use super::Context; use super::Context;
type Matcher = type Matcher = dyn for<'r, 's> Fn(Context<'r, 's>, &'s str) -> Res<&'s str, &'s str>;
dyn for<'r, 's> Fn(Context<'r, 's>, &'s str) -> IResult<&'s str, &'s str, CustomError<&'s str>>;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct ContextTree<'r, 's> { pub struct ContextTree<'r, 's> {