rust: str: add {make,to}_{upper,lower}case() to CString
PATCH v2 1/1 rust: str: add {make,to}_{upper,lower}case() to CString
Add functions to convert a CString to upper- / lowercase, either in-place or by creating a copy of the original CString.
Naming followes the one from the Rust stdlib, where functions starting with 'to' create a copy and functions starting with 'make' perform an in-place conversion.
This is required by the Nova project (GSP only Rust successor of Nouveau) to convert stringified enum values (representing different GPU chipsets) to strings in order to generate the corresponding firmware paths. See also [1].
---
Changes in V2:
- expand commit message mentioning the use case
- expand function doc comments to match the ones from Rust's stdlib
- rename to_* to make_* and add the actual to_* implementations
--- rust/kernel/str.rs | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+)
rust/kernel/str.rs +60 -0
@@ -581,6 +581,66 @@ pub fn try_from_fmt(args: fmt::Arguments<'_>) -> Result<Self, Error> {// exist in the buffer. Ok (Self { buf }) } + +/// Converts this CString to its ASCII lower case equivalent in-place. +/// +/// ASCII letters 'A' to 'Z' are mapped to 'a' to 'z', +/// but non-ASCII letters are unchanged. +/// +/// To return a new lowercased value without modifying the existing one, use +/// [`to_ascii_lowercase()`]. +/// +/// [`to_ascii_lowercase()`]: #method.to_ascii_lowercase +pub fn make_ascii_lowercase (&mut self) { + self.buf.make_ascii_lowercase (); + } + +/// Converts this CString to its ASCII upper case equivalent in-place. +/// +/// ASCII letters 'a' to 'z' are mapped to 'A' to 'Z', +/// but non-ASCII letters are unchanged. +/// +/// To return a new uppercased value without modifying the existing one, use +/// [`to_ascii_uppercase()`]. +/// +/// [`to_ascii_uppercase()`]: #method.to_ascii_uppercase +pub fn make_ascii_uppercase (&mut self) { + self.buf.make_ascii_uppercase (); + } + +/// Returns a copy of this CString where each character is mapped to its +/// ASCII lower case equivalent. +/// +/// ASCII letters 'A' to 'Z' are mapped to 'a' to 'z', +/// but non-ASCII letters are unchanged. +/// +/// To lowercase the value in-place, use [`make_ascii_lowercase`]. +/// +/// [`make_ascii_lowercase`]: str::make_ascii_lowercase +pub fn to_ascii_lowercase (&self) ->Result <CString ,AllocError > { +let mut s = (*self).to_cstring ()?; + + s.make_ascii_lowercase (); + +return Ok (s); + } + +/// Returns a copy of this CString where each character is mapped to its +/// ASCII upper case equivalent. +/// +/// ASCII letters 'a' to 'z' are mapped to 'A' to 'Z', +/// but non-ASCII letters are unchanged. +/// +/// To uppercase the value in-place, use [`make_ascii_uppercase`]. +/// +/// [`make_ascii_uppercase`]: str::make_ascii_uppercase +pub fn to_ascii_uppercase (&self) ->Result <CString ,AllocError > { +let mut s = (*self).to_cstring ()?; + + s.make_ascii_uppercase (); + +return Ok (s); + } }impl Deref for CString {
base-commit: 41bccc98fb7931d63d03f326a746ac4d429c1dd3
Signature · 1 line
2.43.0
Quoted 7 lines · Danilo Krummrich
Add functions to convert a CString to upper- / lowercase, either in-place or by creating a copy of the original CString.
Naming followes the one from the Rust stdlib, where functions starting with 'to' create a copy and functions starting with 'make' perform an in-place conversion.
Quoted 8 lines
This is required by the Nova project (GSP only Rust successor of Nouveau) to convert stringified enum values (representing different GPU chipsets) to strings in order to generate the corresponding firmware paths. See also [1].
Signed-off-by Danilo Krummrich <[email protected]>
Ping.
Quoted 82 lines
---
Changes in V2:
- expand commit message mentioning the use case
- expand function doc comments to match the ones from Rust's stdlib
- rename to_* to make_* and add the actual to_* implementations--- rust/kernel/str.rs | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+)rust/kernel/str.rs +60
-0@@ -581,6 +581,66 @@ pub fn try_from_fmt(args: fmt::Arguments<'_>) -> Result<Self, Error> {// exist in the buffer. Ok (Self { buf }) } + +/// Converts this CString to its ASCII lower case equivalent in-place. +/// +/// ASCII letters 'A' to 'Z' are mapped to 'a' to 'z', +/// but non-ASCII letters are unchanged. +/// +/// To return a new lowercased value without modifying the existing one, use +/// [`to_ascii_lowercase()`]. +/// +/// [`to_ascii_lowercase()`]: #method.to_ascii_lowercase +pub fn make_ascii_lowercase (&mut self) { + self.buf.make_ascii_lowercase (); + } + +/// Converts this CString to its ASCII upper case equivalent in-place. +/// +/// ASCII letters 'a' to 'z' are mapped to 'A' to 'Z', +/// but non-ASCII letters are unchanged. +/// +/// To return a new uppercased value without modifying the existing one, use +/// [`to_ascii_uppercase()`]. +/// +/// [`to_ascii_uppercase()`]: #method.to_ascii_uppercase +pub fn make_ascii_uppercase (&mut self) { + self.buf.make_ascii_uppercase (); + } + +/// Returns a copy of this CString where each character is mapped to its +/// ASCII lower case equivalent. +/// +/// ASCII letters 'A' to 'Z' are mapped to 'a' to 'z', +/// but non-ASCII letters are unchanged. +/// +/// To lowercase the value in-place, use [`make_ascii_lowercase`]. +/// +/// [`make_ascii_lowercase`]: str::make_ascii_lowercase +pub fn to_ascii_lowercase (&self) ->Result <CString ,AllocError > { +let mut s = (*self).to_cstring ()?; + + s.make_ascii_lowercase (); + +return Ok (s); + } + +/// Returns a copy of this CString where each character is mapped to its +/// ASCII upper case equivalent. +/// +/// ASCII letters 'a' to 'z' are mapped to 'A' to 'Z', +/// but non-ASCII letters are unchanged. +/// +/// To uppercase the value in-place, use [`make_ascii_uppercase`]. +/// +/// [`make_ascii_uppercase`]: str::make_ascii_uppercase +pub fn to_ascii_uppercase (&self) ->Result <CString ,AllocError > { +let mut s = (*self).to_cstring ()?; + + s.make_ascii_uppercase (); + +return Ok (s); + } }impl Deref for CString {base-commit:
41bccc98fb7931d63d03f326a746ac4d429c1dd3
Alice Ryhl
reviewerQuoted 8 lines · Danilo Krummrich
Add functions to convert a CString to upper- / lowercase, either in-place or by creating a copy of the original CString.
Naming followes the one from the Rust stdlib, where functions starting with 'to' create a copy and functions starting with 'make' perform an in-place conversion.
Quoted 8 lines
This is required by the Nova project (GSP only Rust successor of Nouveau) to convert stringified enum values (representing different GPU chipsets) to strings in order to generate the corresponding firmware paths. See also [1].
Signed-off-by Danilo Krummrich <[email protected]>
Not a deal-breaker, but this comment of mine still applies:
Alice
Quoted 14 lines · Alice Ryhl
Quoted 13 lines · Danilo Krummrich
Add functions to convert a CString to upper- / lowercase, either in-place or by creating a copy of the original CString.
Naming followes the one from the Rust stdlib, where functions starting with 'to' create a copy and functions starting with 'make' perform an in-place conversion.
This is required by the Nova project (GSP only Rust successor of Nouveau) to convert stringified enum values (representing different GPU chipsets) to strings in order to generate the corresponding firmware paths. See also [1].
Quoted 7 lines
Quoted 3 lines
Signed-off-by Danilo Krummrich <[email protected]>Not a deal-breaker, but this comment of mine still applies:
I missed your mail, gonna send a v3.
- Danilo
Quoted 3 lines
Alice