[framework] Implements ascii + utf8 strings all over again #18462
Conversation
This file contains 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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
3 Ignored Deployments
|
tzakian
approved these changes
Jun 28, 2024
| const EINVALID_ASCII_CHARACTER: u64 = 0x10000; | ||
| const EInvalidASCIICharacter: u64 = 0x10000; | ||
| /// An invalid index was encountered when creating a substring. | ||
| const EInvalidIndex: u64 = 0x10001; |
There was a problem hiding this comment.
ughhhh but fine this is the right thing to do
There was a problem hiding this comment.
Idk I think we should at some point switch all of the std/sui errors to using clever errors.
It will be a pain, and maybe break someone somewhere, but I feel like it is the right thing to do long term
tnowacki
approved these changes
Jun 28, 2024
| const EINVALID_ASCII_CHARACTER: u64 = 0x10000; | ||
| const EInvalidASCIICharacter: u64 = 0x10000; | ||
| /// An invalid index was encountered when creating a substring. | ||
| const EInvalidIndex: u64 = 0x10001; |
There was a problem hiding this comment.
Idk I think we should at some point switch all of the std/sui errors to using clever errors.
It will be a pain, and maybe break someone somewhere, but I feel like it is the right thing to do long term
| i = i + 1; | ||
| }; | ||
| option::some(String { bytes }) | ||
| let is_valid = bytes.all!(|byte| is_valid_char(*byte)); |
| i = i + 1; | ||
| }; | ||
| true | ||
| string.bytes.all!(|byte| is_printable_char(*byte)) |
| /// Insert the `other` string at the `at` index of `string`. | ||
| public fun insert(s: &mut String, at: u64, o: String) { | ||
| assert!(at <= s.length(), EInvalidIndex); | ||
| o.into_bytes().destroy!(|e| s.bytes.insert(e, at)); |
Comment on lines
+87
to
+88
| let mut bytes = vector[]; | ||
| i.range_do!(j, |i| bytes.push_back(string.bytes[i])); |
There was a problem hiding this comment.
I might prefer vector::tabulate for this one. But this one is good too :)
Comment on lines
+129
to
+136
| let bytes = string.as_bytes().map_ref!(|byte| char_to_uppercase(*byte)); | ||
| String { bytes } | ||
| } | ||
|
|
||
| /// Convert a `string` to its lowercase equivalent. | ||
| public fun to_lowercase(string: &String): String { | ||
| let bytes = string.as_bytes().map_ref!(|byte| char_to_lowercase(*byte)); | ||
| String { bytes } |
Comment on lines
+140
to
+141
| /// Returns the length of the `string` if the `substr` is not found. | ||
| /// Returns 0 if the `substr` is empty. |
There was a problem hiding this comment.
I really hate this API, but I agree it is the right thing to do for consistency
There was a problem hiding this comment.
Same here, not a fan.
Comment on lines
125
to
131
| /// [DEPRECATED] | ||
| public fun bytes(s: &String): &vector<u8> { s.as_bytes() } | ||
|
|
||
| /// [DEPRECATED] | ||
| public fun sub_string(s: &String, i: u64, j: u64): String { | ||
| s.substring(i, j) | ||
| } |
There was a problem hiding this comment.
@damirka #[deprecated] should land soon ™️ , if it hasn't already
7 tasks
tx-tomcat
pushed a commit
to tx-tomcat/sui-network
that referenced
this pull request
Jul 29, 2024
…s#18462) ## Description This PR rolls MystenLabs#17380 (successfully merged once) yet again. ## Test plan Features tests. ## Release notes Check each box that your changes affect. If none of the boxes relate to your changes, release notes aren't required. For each box you select, include information after the relevant heading that describes the impact of your changes that a user might notice and any actions they must take to implement updates. - [x] Protocol: This change updates the [ascii module](https://docs.sui.io/references/framework/move-stdlib/ascii) in the following ways: Adds new methods to `std::ascii`: - `ascii::append(&mut String, String)` - `ascii::is_empty(): bool` - `ascii::substring(&String, i, j): String` - `ascii::index_of(&String, &String): u64` - `ascii::to_uppercase(&String): String` - `ascii::to_lowercase(&String): String` These additions make the ASCII interface more similar to the UTF8 one. Renames: - `string::bytes() to string::as_bytes()` - `string::sub_string() to string::substring()` Deprecates: - `string::sub_string` in favour of `string::substring` - `string::bytes` in favour of `string::as_bytes` Additional changes: - updates `std::type_name` to use `std::substring` - removes use statements for implicit imports - renames constants from `E_INDEX` to conventional `EIndexOutOfBounds`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
This PR rolls #17380 (successfully merged once) yet again.
Test plan
Features tests.
Release notes
Check each box that your changes affect. If none of the boxes relate to your changes, release notes aren't required.
For each box you select, include information after the relevant heading that describes the impact of your changes that a user might notice and any actions they must take to implement updates.
Protocol: This change updates the ascii module in the following ways:
std::ascii:ascii::append(&mut String, String)ascii::is_empty(): boolascii::substring(&String, i, j): Stringascii::index_of(&String, &String): u64ascii::to_uppercase(&String): Stringascii::to_lowercase(&String): StringThese additions make the ASCII interface more similar to the UTF8 one.
Renames:
-
string::bytes() to string::as_bytes()-
string::sub_string() to string::substring()Deprecates:
-
string::sub_stringin favour ofstring::substring-
string::bytesin favour ofstring::as_bytesAdditional changes:
- updates
std::type_nameto usestd::substring- removes use statements for implicit imports
- renames constants from
E_INDEXto conventionalEIndexOutOfBounds