employer
/
tame
1
0
Fork 0
Code Packages Releases Activity

tamer: xir::writer: write{=>_all} 

Really, with a C background, I should have known that `write` may not write
all bytes, and I'm pretty sure I was aware, so I'm not sure how that slipped
my mind for every call.  But it's not a great default, and I do feel like
`write_all` should be the deafult behavior, despite the syscall and C
library name.

It shouldn't take clippy to warn about something so significant.
main
Mike Gerwitz 2023-01-01 23:43:00 -05:00
parent 0863536149
commit 9103c93693
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tamer/src/xir/writer.rs
View File

@ -104,9 +104,7 @@ impl WriterState {
#[inline]
fn close_tag_if_open<W: Write>(&self, sink: &mut W) -> Result<()> {
Ok(match *self {
Self::NodeOpen => {
sink.write(b">")?;
}
Self::NodeOpen => sink.write_all(b">")?,
_ => (),
})
}
@ -174,11 +172,11 @@ impl<S: Escaper> XmlWriter<S> for QName {
_escaper: &S,
) -> Result {
if let Some(prefix) = self.prefix() {
sink.write(prefix.lookup_str().as_bytes())?;
sink.write(b":")?;
sink.write_all(prefix.lookup_str().as_bytes())?;
sink.write_all(b":")?;
}
sink.write(self.local_name().lookup_str().as_bytes())?;
sink.write_all(self.local_name().lookup_str().as_bytes())?;
Ok(prev_state)
}
}
@ -197,14 +195,14 @@ impl<S: Escaper> XmlWriter<S> for &Token {
(Open(name, _), W::NodeExpected | W::NodeOpen) => {
// If a node is still open, then we are a child.
prev_state.close_tag_if_open(sink)?;
sink.write(b"<")?;
sink.write_all(b"<")?;
name.write(sink, prev_state, escaper)?;
Ok(W::NodeOpen)
}
(Close(None, _), W::NodeOpen) => {
sink.write(b"/>")?;
sink.write_all(b"/>")?;
Ok(W::NodeExpected)
}
@ -214,44 +212,44 @@ impl<S: Escaper> XmlWriter<S> for &Token {
// `<foo></foo>`.
prev_state.close_tag_if_open(sink)?;
sink.write(b"</")?;
sink.write_all(b"</")?;
name.write(sink, prev_state, escaper)?;
sink.write(b">")?;
sink.write_all(b">")?;
Ok(W::NodeExpected)
}
(AttrName(name, _), W::NodeOpen) => {
sink.write(b" ")?;
sink.write_all(b" ")?;
name.write(sink, prev_state, escaper)?;
Ok(W::AttrNameAdjacent)
}
(AttrValue(value, _), W::AttrNameAdjacent) => {
sink.write(b"=\"")?;
sink.write(escaper.escape(*value).lookup_str().as_bytes())?;
sink.write(b"\"")?;
sink.write_all(b"=\"")?;
sink.write_all(escaper.escape(*value).lookup_str().as_bytes())?;
sink.write_all(b"\"")?;
Ok(W::NodeOpen)
}
(AttrValue(value, _), W::AttrFragmentAdjacent) => {
sink.write(escaper.escape(*value).lookup_str().as_bytes())?;
sink.write(b"\"")?;
sink.write_all(escaper.escape(*value).lookup_str().as_bytes())?;
sink.write_all(b"\"")?;
Ok(W::NodeOpen)
}
(AttrValueFragment(value, _), W::AttrNameAdjacent) => {
sink.write(b"=\"")?;
sink.write(escaper.escape(*value).lookup_str().as_bytes())?;
sink.write_all(b"=\"")?;
sink.write_all(escaper.escape(*value).lookup_str().as_bytes())?;
Ok(W::AttrFragmentAdjacent)
}
(AttrValueFragment(value, _), W::AttrFragmentAdjacent) => {
sink.write(escaper.escape(*value).lookup_str().as_bytes())?;
sink.write_all(escaper.escape(*value).lookup_str().as_bytes())?;
Ok(W::AttrFragmentAdjacent)
}
@ -262,7 +260,7 @@ impl<S: Escaper> XmlWriter<S> for &Token {
// haven't yet encountered the unescaped representation.
(Text(text, _), W::NodeExpected | W::NodeOpen) => {
prev_state.close_tag_if_open(sink)?;
sink.write(escaper.escape(*text).lookup_str().as_bytes())?;
sink.write_all(escaper.escape(*text).lookup_str().as_bytes())?;
Ok(W::NodeExpected)
}
@ -272,9 +270,9 @@ impl<S: Escaper> XmlWriter<S> for &Token {
// that will not always be the case and we must escape `--`!
(Comment(comment, _), W::NodeExpected | W::NodeOpen) => {
prev_state.close_tag_if_open(sink)?;
sink.write(b"<!--")?;
sink.write(comment.lookup_str().as_bytes())?;
sink.write(b"-->")?;
sink.write_all(b"<!--")?;
sink.write_all(comment.lookup_str().as_bytes())?;
sink.write_all(b"-->")?;
Ok(W::NodeExpected)
}