Skip to content

Integrate vendored "utf-8" crate with tendril types #732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonwuelker merged 1 commit into from
Feb 26, 2026
Merged

Integrate vendored "utf-8" crate with tendril types #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion tendril/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ pub mod stream;

mod buf32;
mod tendril;
mod utf8;
mod utf8_decode;
mod util;

Expand Down
83 changes: 45 additions & 38 deletions tendril/src/stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

//! Streams of tendrils.

use crate::fmt;
use crate::utf8_decode::{decode_utf8, DecodeError, REPLACEMENT_CHARACTER};
use crate::{fmt, IncompleteUtf8};
use crate::{Atomicity, NonAtomic, Tendril};

use std::borrow::Cow;
Expand All @@ -15,7 +16,6 @@ use std::io;
use std::marker::PhantomData;
use std::path::Path;

use crate::utf8;
#[cfg(feature = "encoding_rs")]
use encoding_rs::{self, DecoderResult};

Expand Down Expand Up @@ -124,7 +124,7 @@ where
A: Atomicity,
{
pub inner_sink: Sink,
incomplete: Option<utf8::Incomplete>,
incomplete: Option<IncompleteUtf8>,
marker: PhantomData<A>,
}

Expand All @@ -150,64 +150,71 @@ where
A: Atomicity,
{
#[inline]
fn process(&mut self, mut t: Tendril<fmt::Bytes, A>) {
fn process(&mut self, mut bytes: Tendril<fmt::Bytes, A>) {
// FIXME: remove take() and map() when non-lexical borrows are stable.
if let Some(mut incomplete) = self.incomplete.take() {
let resume_at = incomplete.try_complete(&t).map(|(result, rest)| {
match result {
Ok(s) => self.inner_sink.process(Tendril::from_slice(s)),
Err(_) => {
self.inner_sink.error("invalid byte sequence".into());
self.inner_sink
.process(Tendril::from_slice(utf8::REPLACEMENT_CHARACTER));
},
}
t.len() - rest.len()
});
let resume_at = incomplete
.try_to_complete_codepoint(&bytes)
.map(|(result, rest)| {
match result {
Ok(decoded_string) => {
self.inner_sink.process(Tendril::from_slice(decoded_string))
},
Err(_) => {
self.inner_sink.error("invalid byte sequence".into());
self.inner_sink
.process(Tendril::from_slice(REPLACEMENT_CHARACTER));
},
}
bytes.len() - rest.len()
});
match resume_at {
None => {
self.incomplete = Some(incomplete);
return;
},
Some(resume_at) => t.pop_front(resume_at as u32),
Some(resume_at) => bytes.pop_front(resume_at as u32),
}
}
while !t.is_empty() {
let unborrowed_result = match utf8::decode(&t) {
while !bytes.is_empty() {
let unborrowed_result = match decode_utf8(&bytes) {
Ok(s) => {
debug_assert!(s.as_ptr() == t.as_ptr());
debug_assert!(s.len() == t.len());
debug_assert!(s.as_ptr() == bytes.as_ptr());
debug_assert!(s.len() == bytes.len());
Ok(())
},
Err(utf8::DecodeError::Invalid {
Err(DecodeError::Invalid {
valid_prefix,
invalid_sequence,
..
}) => {
debug_assert!(valid_prefix.as_ptr() == t.as_ptr());
debug_assert!(valid_prefix.len() <= t.len());
debug_assert!(valid_prefix.as_ptr() == bytes.as_ptr());
debug_assert!(valid_prefix.len() <= bytes.len());
Err((
valid_prefix.len(),
Err(valid_prefix.len() + invalid_sequence.len()),
))
},
Err(utf8::DecodeError::Incomplete {
Err(DecodeError::Incomplete {
valid_prefix,
incomplete_suffix,
}) => {
debug_assert!(valid_prefix.as_ptr() == t.as_ptr());
debug_assert!(valid_prefix.len() <= t.len());
debug_assert!(valid_prefix.as_ptr() == bytes.as_ptr());
debug_assert!(valid_prefix.len() <= bytes.len());
Err((valid_prefix.len(), Ok(incomplete_suffix)))
},
};
match unborrowed_result {
Ok(()) => {
unsafe { self.inner_sink.process(t.reinterpret_without_validating()) }
unsafe {
self.inner_sink
.process(bytes.reinterpret_without_validating())
}
return;
},
Err((valid_len, and_then)) => {
if valid_len > 0 {
let subtendril = t.subtendril(0, valid_len as u32);
let subtendril = bytes.subtendril(0, valid_len as u32);
unsafe {
self.inner_sink
.process(subtendril.reinterpret_without_validating())
Expand All @@ -221,8 +228,8 @@ where
Err(offset) => {
self.inner_sink.error("invalid byte sequence".into());
self.inner_sink
.process(Tendril::from_slice(utf8::REPLACEMENT_CHARACTER));
t.pop_front(offset as u32);
.process(Tendril::from_slice(REPLACEMENT_CHARACTER));
bytes.pop_front(offset as u32);
},
}
},
Expand All @@ -243,7 +250,7 @@ where
self.inner_sink
.error("incomplete byte sequence at end of stream".into());
self.inner_sink
.process(Tendril::from_slice(utf8::REPLACEMENT_CHARACTER));
.process(Tendril::from_slice(REPLACEMENT_CHARACTER));
}
self.inner_sink.finish()
}
Expand Down Expand Up @@ -380,7 +387,7 @@ where

#[cfg(feature = "encoding_rs")]
fn decode_to_sink<Sink, A>(
mut t: Tendril<fmt::Bytes, A>,
mut input: Tendril<fmt::Bytes, A>,
decoder: &mut encoding_rs::Decoder,
sink: &mut Sink,
last: bool,
Expand All @@ -391,13 +398,13 @@ fn decode_to_sink<Sink, A>(
loop {
let mut out = <Tendril<fmt::Bytes, A>>::new();
let max_len = decoder
.max_utf8_buffer_length_without_replacement(t.len())
.max_utf8_buffer_length_without_replacement(input.len())
.unwrap_or(8192);
unsafe {
out.push_uninitialized(std::cmp::min(max_len as u32, 8192));
out.push_uninitialized(max_len.min(8192) as u32);
}
let (result, bytes_read, bytes_written) =
decoder.decode_to_utf8_without_replacement(&t, &mut out, last);
decoder.decode_to_utf8_without_replacement(&input, &mut out, last);
if bytes_written > 0 {
sink.process(unsafe {
out.subtendril(0, bytes_written as u32)
Expand All @@ -409,11 +416,11 @@ fn decode_to_sink<Sink, A>(
DecoderResult::OutputFull => {},
DecoderResult::Malformed(_, _) => {
sink.error(Cow::Borrowed("invalid sequence"));
sink.process("\u{FFFD}".into());
sink.process(Tendril::from_slice(REPLACEMENT_CHARACTER));
},
}
t.pop_front(bytes_read as u32);
if t.is_empty() {
input.pop_front(bytes_read as u32);
if input.is_empty() {
return;
}
}
Expand Down
141 changes: 0 additions & 141 deletions tendril/src/utf8.rs
View file
Open in desktop

This file was deleted.

Loading