Skip to content

Commit 8bb07b0

Browse files
committed
skip UTF8 checking and initialize with b'.'
1 parent ba8c1d6 commit 8bb07b0

2 files changed

Lines changed: 5 additions & 9 deletions

File tree

‎serde/src/lib.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@
139139
)
140140
)]
141141
// Rustc lints.
142-
#![forbid(unsafe_code)]
143142
#![deny(missing_docs, unused_imports)]
144143

145144
////////////////////////////////////////////////////////////////////////////////

‎serde/src/ser/impls.rs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,6 @@ const DEC_DIGITS_LUT: &'static [u8] = b"\
683683

684684
#[inline]
685685
fn format_u8(mut n: u8, out: &mut [u8]) -> usize {
686-
assert!(out.len() >= 3);
687686
if n >= 100 {
688687
let d1 = ((n % 100) << 1) as usize;
689688
n /= 100;
@@ -723,15 +722,13 @@ impl Serialize for net::Ipv4Addr {
723722
if serializer.is_human_readable() {
724723
const MAX_LEN: usize = 15;
725724
debug_assert_eq!(MAX_LEN, "101.102.103.104".len());
726-
let mut buf = [0u8; MAX_LEN];
727-
let mut written = 0;
728-
written += format_u8(self.octets()[0], &mut buf);
725+
let mut buf = [b'.'; MAX_LEN];
726+
let mut written = format_u8(self.octets()[0], &mut buf);
729727
for oct in &self.octets()[1..] {
730-
buf[written] = b'.';
731-
written += 1;
732-
written += format_u8(*oct, &mut buf[written..]);
728+
written += format_u8(*oct, &mut buf[written..]) + 1;
733729
}
734-
serializer.serialize_str(str::from_utf8(&buf[..written]).unwrap())
730+
// We've only written ASCII bytes to the buffer, so it is valid UTF-8
731+
serializer.serialize_str(unsafe { str::from_utf8_unchecked(&buf[..written]) })
735732
} else {
736733
self.octets().serialize(serializer)
737734
}

0 commit comments

Comments
 (0)