Make sink fields public, remove accessors

Author: SimonSapin

html5ever/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "html5ever"
-version = "0.16.0"
+version = "0.17.0"
 authors = [ "The html5ever Project Developers" ]
 license = "MIT / Apache-2.0"
 repository = "https://github.com/servo/html5ever"

html5ever/src/driver.rs

@@ -92,7 +92,7 @@ impl<Sink: TreeSink> TendrilSink<tendril::fmt::UTF8> for Parser<Sink> {
 
     // FIXME: Is it too noisy to report every character decoding error?
     fn error(&mut self, desc: Cow<'static, str>) {
-        self.tokenizer.sink_mut().sink_mut().parse_error(desc)
+        self.tokenizer.sink.sink.parse_error(desc)
     }
 
     type Output = Sink::Output;
@@ -102,7 +102,7 @@ impl<Sink: TreeSink> TendrilSink<tendril::fmt::UTF8> for Parser<Sink> {
         while let TokenizerResult::Script(_) = self.tokenizer.feed(&mut self.input_buffer) {}
         assert!(self.input_buffer.is_empty());
         self.tokenizer.end();
-        self.tokenizer.unwrap().unwrap().finish()
+        self.tokenizer.sink.sink.finish()
     }
 }
 

html5ever/src/tokenizer/mod.rs

@@ -101,7 +101,7 @@ pub struct Tokenizer<Sink> {
     opts: TokenizerOpts,
 
     /// Destination for tokens we emit.
-    sink: Sink,
+    pub sink: Sink,
 
     /// The abstract machine state as described in the spec.
     state: states::State,
@@ -201,18 +201,6 @@ impl<Sink: TokenSink> Tokenizer<Sink> {
         }
     }
 
-    pub fn unwrap(self) -> Sink {
-        self.sink
-    }
-
-    pub fn sink<'a>(&'a self) -> &'a Sink {
-        &self.sink
-    }
-
-    pub fn sink_mut<'a>(&'a mut self) -> &'a mut Sink {
-        &mut self.sink
-    }
-
     /// Feed an input string into the tokenizer.
     pub fn feed(&mut self, input: &mut BufferQueue) -> TokenizerResult<Sink::Handle> {
         if input.is_empty() {

html5ever/src/tree_builder/mod.rs

@@ -88,7 +88,7 @@ pub struct TreeBuilder<Handle, Sink> {
     opts: TreeBuilderOpts,
 
     /// Consumer of tree modifications.
-    sink: Sink,
+    pub sink: Sink,
 
     /// Insertion mode.
     mode: InsertionMode,
@@ -245,18 +245,6 @@ impl<Handle, Sink> TreeBuilder<Handle, Sink>
         }
     }
 
-    pub fn unwrap(self) -> Sink {
-        self.sink
-    }
-
-    pub fn sink<'a>(&'a self) -> &'a Sink {
-        &self.sink
-    }
-
-    pub fn sink_mut<'a>(&'a mut self) -> &'a mut Sink {
-        &mut self.sink
-    }
-
     /// Call the `Tracer`'s `trace_handle` method on every `Handle` in the tree builder's
     /// internal state.  This is intended to support garbage-collected DOMs.
     pub fn trace_handles(&self, tracer: &Tracer<Handle=Handle>) {

html5ever/tests/tokenizer.rs

@@ -143,7 +143,7 @@ fn tokenize(input: Vec<StrTendril>, opts: TokenizerOpts) -> Vec<Token> {
     }
     let _ = tok.feed(&mut buffer);
     tok.end();
-    tok.unwrap().get_tokens()
+    tok.sink.get_tokens()
 }
 
 trait JsonExt: Sized {

xml5ever/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "xml5ever"
-version = "0.6.0"
+version = "0.7.0"
 authors = ["The xml5ever project developers"]
 license = "MIT / Apache-2.0"
 repository = "https://github.com/servo/html5ever"

xml5ever/src/driver.rs

@@ -60,12 +60,12 @@ impl<Sink: TreeSink> TendrilSink<tendril::fmt::UTF8> for XmlParser<Sink> {
 
     // FIXME: Is it too noisy to report every character decoding error?
     fn error(&mut self, desc: Cow<'static, str>) {
-        self.tokenizer.sink_mut().sink_mut().parse_error(desc)
+        self.tokenizer.sink.sink.parse_error(desc)
     }
 
     fn finish(mut self) -> Self::Output {
         self.tokenizer.end();
-        self.tokenizer.unwrap().unwrap().finish()
+        self.tokenizer.sink.sink.finish()
     }
 }
 

xml5ever/src/tokenizer/mod.rs

@@ -104,7 +104,7 @@ pub struct XmlTokenizer<Sink> {
     opts: XmlTokenizerOpts,
 
     /// Destination for tokens we emit.
-    sink: Sink,
+    pub sink: Sink,
 
     /// The abstract machine state as described in the spec.
     state: states::XmlState,
@@ -201,21 +201,6 @@ impl <Sink:TokenSink> XmlTokenizer<Sink> {
         }
     }
 
-    /// Returns destination of token events.
-    pub fn unwrap(self) -> Sink {
-        self.sink
-    }
-
-    /// Immutably borrows destination of token events.
-    pub fn sink<'a>(&'a self) -> &'a Sink {
-        &self.sink
-    }
-
-    /// Mutably borrows destinantion of token events.
-    pub fn sink_mut<'a>(&'a mut self) -> &'a mut Sink {
-        &mut self.sink
-    }
-
     /// Feed an input string into the tokenizer.
     pub fn feed(&mut self, mut input: StrTendril) {
         if input.len() == 0 {

xml5ever/src/tree_builder/mod.rs

@@ -199,7 +199,7 @@ pub struct XmlTreeBuilder<Handle, Sink> {
     _opts: XmlTreeBuilderOpts,
 
     /// Consumer of tree modifications.
-    sink: Sink,
+    pub sink: Sink,
 
     /// The document node, which is created by the sink.
     doc_handle: Handle,
@@ -248,21 +248,6 @@ impl<Handle, Sink> XmlTreeBuilder<Handle, Sink>
         }
     }
 
-    /// Returns consumer of tree modifications.
-    pub fn unwrap(self) -> Sink {
-        self.sink
-    }
-
-    /// Immutably borrows consumer of tree modifications.
-    pub fn sink<'a>(&'a self) -> &'a Sink {
-        &self.sink
-    }
-
-    /// Mutably borrows consumer of tree modifications.
-    pub fn sink_mut<'a>(&'a mut self) -> &'a mut Sink {
-        &mut self.sink
-    }
-
     /// Call the `Tracer`'s `trace_handle` method on every `Handle` in the tree builder's
     /// internal state.  This is intended to support garbage-collected DOMs.
     pub fn trace_handles(&self, tracer: &Tracer<Handle=Handle>) {

xml5ever/tests/tokenizer.rs

@@ -136,7 +136,7 @@ fn tokenize_xml(input: Vec<StrTendril>, opts: XmlTokenizerOpts) -> Vec<Token> {
         tok.feed(chunk);
     }
     tok.end();
-    tok.unwrap().get_tokens()
+    tok.sink.get_tokens()
 }
 
 trait JsonExt: Sized {