Avoid std::fmt in serialization code #190
Conversation
It hasn’t been used anywhere for a long time.
src/serializer.rs
Outdated
| @@ -90,7 +75,7 @@ impl<'a> ToCss for Token<'a> { | |||
| serialize_unquoted_url(&**value, dest)?; | |||
| dest.write_str(")")?; | |||
| }, | |||
| Token::Delim(value) => write!(dest, "{}", value)?, | |||
| Token::Delim(value) => dest.write_str(value.encode_utf8(&mut [0_u8; 4]))?, | |||
There was a problem hiding this comment.
Not sure why I didn’t think of that… Done :)
src/serializer.rs
Outdated
| impl<W: fmt::Write> io::Write for AssumeUtf8<W> { | ||
| #[inline] | ||
| fn write_all(&mut self, buf: &[u8]) -> io::Result<()> { | ||
| // Safety: itoa only emits ASCII |
There was a problem hiding this comment.
Can we assert it?
debug_assert!(buf.iter().all(|b| b.is_ascii()));There was a problem hiding this comment.
Done. (AsciiExt is also implemented on [u8], no need to iterate ourselves.)
| b3 = [b'\\', to_hex_byte(ascii_byte), b' ']; | ||
| &b3[..] | ||
| }; | ||
| dest.write_str(unsafe { str::from_utf8_unchecked(&bytes) }) |
There was a problem hiding this comment.
This could use write_char, I think, but not sure if worth it, this would be faster and it's trivially ascii so...
There was a problem hiding this comment.
When writing more than one byte/char it might be better to minimize the number of calls, but I haven’t measured.
| \\1 \\2 \\3 \\4 \\5 \\6 \\7 \\8 \\9 \\A \\B \\C \\D \\E \\F \\10 \ | ||
| \\11 \\12 \\13 \\14 \\15 \\16 \\17 \\18 \\19 \\1A \\1B \\1C \\1D \\1E \\1F \\20 \ | ||
| \\1 \\2 \\3 \\4 \\5 \\6 \\7 \\8 \\9 \\a \\b \\c \\d \\e \\f \\10 \ | ||
| \\11 \\12 \\13 \\14 \\15 \\16 \\17 \\18 \\19 \\1a \\1b \\1c \\1d \\1e \\1f \\20 \ |
There was a problem hiding this comment.
Maybe run this through try to ensure this doesn't break anything? (seems unlikely)
There was a problem hiding this comment.
I’ll do a Gecko Try run before landing in Servo.
… since it involves costly dynamic dispatch.
|
@bors-servo r=emilio |
|
📌 Commit c42f384 has been approved by |
Avoid std::fmt in serialization code <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-cssparser/190) <!-- Reviewable:end -->
|
☀️ Test successful - status-travis |
This change is