From 41fc406af206e21014eaaba94bcf6b1854f892b3 Mon Sep 17 00:00:00 2001 From: Titus Wormer Date: Fri, 22 Jul 2022 15:03:15 +0200 Subject: Refactor to pass ints instead of vecs around --- src/content/document.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/content/document.rs') diff --git a/src/content/document.rs b/src/content/document.rs index 1a0ffee..163dcda 100644 --- a/src/content/document.rs +++ b/src/content/document.rs @@ -363,10 +363,10 @@ fn containers_after( tokenizer.go_until( state, |code| matches!(code, Code::CarriageReturnLineFeed | Code::Char('\n' | '\r')), - move |(state, remainder)| { + move |(state, back)| { ( State::Fn(Box::new(move |t, c| flow_end(t, c, info, state))), - remainder, + back, ) }, )(tokenizer, code) @@ -415,7 +415,7 @@ fn flow_end( resolve(tokenizer, &mut info); - (State::Ok, Some(vec![code])) + (State::Ok, if matches!(code, Code::None) { 0 } else { 1 }) } State::Nok => unreachable!("unexpected `nok` from flow"), State::Fn(func) => { @@ -441,7 +441,7 @@ fn exit_containers( info.next = Box::new(flow); // This is weird but Rust needs a function there. let result = tokenizer.flush(next); assert!(matches!(result.0, State::Ok)); - assert!(result.1.is_none()); + assert_eq!(result.1, 0); if *phase == Phase::Prefix { info.index = tokenizer.events.len(); -- cgit