This repository was archived by the owner on Apr 2, 2026. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 210
Support Input types on ByteStr #944
Open
vinaychandra
wants to merge
2
commits into
zesterer:main
Choose a base branch
from
vinaychandra:bstr_support
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| use super::*; | ||
| use core::bstr::ByteStr; | ||
|
|
||
| impl<'src> Input<'src> for &'src ByteStr { | ||
| type Cursor = usize; | ||
| type Span = SimpleSpan<usize>; | ||
|
|
||
| type Token = u8; | ||
| type MaybeToken = u8; | ||
|
|
||
| type Cache = Self; | ||
|
|
||
| #[inline] | ||
| fn begin(self) -> (Self::Cursor, Self::Cache) { | ||
| (0, self) | ||
| } | ||
|
|
||
| #[inline] | ||
| fn cursor_location(cursor: &Self::Cursor) -> usize { | ||
| *cursor | ||
| } | ||
|
|
||
| #[inline(always)] | ||
| unsafe fn next_maybe( | ||
| this: &mut Self::Cache, | ||
| cursor: &mut Self::Cursor, | ||
| ) -> Option<Self::MaybeToken> { | ||
| if let Some(tok) = this.get(*cursor) { | ||
| *cursor += 1; | ||
| Some(*tok) | ||
| } else { | ||
| None | ||
| } | ||
| } | ||
|
|
||
| #[inline(always)] | ||
| unsafe fn span(_this: &mut Self::Cache, range: Range<&Self::Cursor>) -> Self::Span { | ||
| (*range.start..*range.end).into() | ||
| } | ||
| } | ||
|
|
||
| impl<'src> ExactSizeInput<'src> for &'src ByteStr { | ||
| #[inline(always)] | ||
| unsafe fn span_from(this: &mut Self::Cache, range: RangeFrom<&Self::Cursor>) -> Self::Span { | ||
| (*range.start..this.len()).into() | ||
| } | ||
| } | ||
|
|
||
| impl Sealed for &ByteStr {} | ||
| impl<'src> StrInput<'src> for &'src ByteStr { | ||
| #[doc(hidden)] | ||
| fn stringify(slice: Self::Slice) -> String { | ||
| slice | ||
| .iter() | ||
| // .map(|e| core::ascii::Char::from_u8(e).unwrap_or(AsciiChar::Substitute).to_char()) | ||
| .map(|e| char::from(*e)) | ||
| .collect() | ||
| } | ||
| } | ||
|
|
||
| impl<'src> SliceInput<'src> for &'src ByteStr { | ||
| type Slice = &'src ByteStr; | ||
|
|
||
| #[inline(always)] | ||
| fn full_slice(this: &mut Self::Cache) -> Self::Slice { | ||
| *this | ||
| } | ||
|
|
||
| #[inline(always)] | ||
| unsafe fn slice(this: &mut Self::Cache, range: Range<&Self::Cursor>) -> Self::Slice { | ||
| &this[*range.start..*range.end] | ||
| } | ||
|
|
||
| #[inline(always)] | ||
| unsafe fn slice_from(this: &mut Self::Cache, from: RangeFrom<&Self::Cursor>) -> Self::Slice { | ||
| &this[*from.start..] | ||
| } | ||
| } | ||
|
|
||
| impl<'src> ValueInput<'src> for &'src ByteStr { | ||
| #[inline(always)] | ||
| unsafe fn next(this: &mut Self::Cache, cursor: &mut Self::Cursor) -> Option<Self::Token> { | ||
| Self::next_maybe(this, cursor) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider adding module-level documentation to explain the purpose of this module and when users should use ByteStr as an input type. Additionally, the Input trait documentation in src/input.rs (around lines 25-29) should be updated to include ByteStr in the list of common input types and their implemented traits, similar to how &str and &[T] are documented.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nah, listing it is superfluous and the impl will appear in the docs anyway