From 41fe94244a7b6442fe2e06f114a45f122dda36c4 Mon Sep 17 00:00:00 2001 From: Nipun Garg Date: Mon, 27 Jan 2020 23:46:37 +0530 Subject: Refactor ServoParser Tokenizer to return TokenizerResult --- components/script/dom/servoparser/xml.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'components/script/dom/servoparser/xml.rs') diff --git a/components/script/dom/servoparser/xml.rs b/components/script/dom/servoparser/xml.rs index ac900d61ce0..9b609cd7ea4 100644 --- a/components/script/dom/servoparser/xml.rs +++ b/components/script/dom/servoparser/xml.rs @@ -10,6 +10,7 @@ use crate::dom::document::Document; use crate::dom::htmlscriptelement::HTMLScriptElement; use crate::dom::node::Node; use crate::dom::servoparser::{ParsingAlgorithm, Sink}; +use html5ever::tokenizer::TokenizerResult; use js::jsapi::JSTracer; use servo_url::ServoUrl; use xml5ever::buffer_queue::BufferQueue; @@ -39,12 +40,13 @@ impl Tokenizer { Tokenizer { inner: tok } } - pub fn feed(&mut self, input: &mut BufferQueue) -> Result<(), DomRoot> { + #[must_use] + pub fn feed(&mut self, input: &mut BufferQueue) -> TokenizerResult> { self.inner.run(input); - if let Some(script) = self.inner.sink.sink.script.take() { - return Err(script); + match self.inner.sink.sink.script.take() { + Some(script) => TokenizerResult::Script(script), + None => TokenizerResult::Done, } - Ok(()) } pub fn end(&mut self) { -- cgit v1.2.3