-
Notifications
You must be signed in to change notification settings - Fork 723
Overload plainHexEncoded methods for some StringProtocol
#3434
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.
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
Open
MaxDesiatov
wants to merge
2
commits into
apple:main
Choose a base branch
from
MaxDesiatov:maxd/stringhex-bb-generic
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.
+26
−1
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 |
|---|---|---|
|
|
@@ -147,9 +147,23 @@ extension ByteBuffer { | |
| /// - plainHexEncodedBytes: The hex encoded string to write. Plain hex dump format is hex bytes optionally separated by spaces, i.e. `48 65 6c 6c 6f` or `48656c6c6f` for `Hello`. | ||
| /// This format is compatible with `xxd` CLI utility. | ||
| /// - Returns: The number of bytes written. | ||
| @_disfavoredOverload | ||
| @discardableResult | ||
| @inlinable | ||
| public mutating func writePlainHexEncodedBytes(_ plainHexEncodedBytes: String) throws -> Int { | ||
| try self.writePlainHexEncodedBytes(plainHexEncodedBytes) | ||
| } | ||
|
|
||
| // MARK: Hex encoded string APIs | ||
| /// Write ASCII hexadecimal `string` into this `ByteBuffer` as raw bytes, decoding the hexadecimal & moving the writer index forward appropriately. | ||
| /// This method will throw if the string input is not of the "plain" hex encoded format. | ||
| /// - Parameters: | ||
| /// - plainHexEncodedBytes: The hex encoded string to write. Plain hex dump format is hex bytes optionally separated by spaces, i.e. `48 65 6c 6c 6f` or `48656c6c6f` for `Hello`. | ||
| /// This format is compatible with `xxd` CLI utility. | ||
| /// - Returns: The number of bytes written. | ||
| @discardableResult | ||
| @inlinable | ||
| public mutating func writePlainHexEncodedBytes(_ plainHexEncodedBytes: some StringProtocol) throws -> Int { | ||
| var slice = plainHexEncodedBytes.utf8[...] | ||
| let initialWriterIndex = self.writerIndex | ||
|
|
||
|
|
@@ -895,8 +909,19 @@ extension ByteBufferAllocator { | |
| /// This will allocate a new `ByteBuffer` with enough space to fit `bytes` and potentially some extra space. | ||
| /// | ||
| /// - Returns: The `ByteBuffer` containing the written bytes. | ||
| @_disfavoredOverload | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think |
||
| @inlinable | ||
| public func buffer(plainHexEncodedBytes string: String) throws -> ByteBuffer { | ||
| try buffer(plainHexEncodedBytes: string) | ||
| } | ||
|
|
||
| /// Create a fresh `ByteBuffer` containing the `bytes` decoded from the ASCII `plainHexEncodedBytes` string . | ||
| /// | ||
| /// This will allocate a new `ByteBuffer` with enough space to fit `bytes` and potentially some extra space. | ||
| /// | ||
| /// - Returns: The `ByteBuffer` containing the written bytes. | ||
| @inlinable | ||
| public func buffer(plainHexEncodedBytes string: some StringProtocol) throws -> ByteBuffer { | ||
| var buffer = self.buffer(capacity: string.utf8.count / 2) | ||
| try buffer.writePlainHexEncodedBytes(string) | ||
| return buffer | ||
|
|
||
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
Oops, something went wrong.
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.
I don't think
@_disfavoredOverloadshould be needed here.