support Errno formatting in no_std #44
Merged
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
A1-Triard
commented
May 10, 2022
src/wasi.rs
Outdated
| let mut buf = [0 as c_char; 1024]; | ||
| unsafe { | ||
| let mut buf = [0u8; 1024]; | ||
| let c_str = unsafe { | ||
| if strerror_r(err.0, buf.as_mut_ptr(), buf.len() as libc::size_t) < 0 { |
There was a problem hiding this comment.
error[E0308]: mismatched types
Error: --> src/wasi.rs:32:30
|
32 | if strerror_r(err.0, buf.as_mut_ptr(), buf.len() as libc::size_t) < 0 {
| ---------- ^^^^^^^^^^^^^^^^ expected `i8`, found `u8`
| |
| arguments to this function are incorrect
|
= note: expected raw pointer `*mut i8`
found raw pointer `*mut u8`
note: function defined here
--> src/wasi.rs:66:8
|
66 | fn strerror_r(errnum: c_int, buf: *mut c_char,
| ^^^^^^^^^^
Cargo.toml
Outdated
| @@ -14,7 +14,8 @@ categories = ["no-std", "os"] | |||
| libc = "0.2" | |||
|
|
|||
| [target.'cfg(windows)'.dependencies] | |||
| winapi = { version = "0.3", features = ["errhandlingapi", "minwindef"] } | |||
| widestring = { version = "0.5.1", default-features = false } | |||
There was a problem hiding this comment.
widestring MSRV is 1.58.1.
We can bump up our MSRV as well, but I'm not sure what our users will think about that. For example, caps and rustix guarantee 1.36 and 1.48 respectively.
Is there an easy alternative we can use here?
cc @sunfishcode and @lucab
sunfishcode
reviewed
May 12, 2022
src/windows.rs
Outdated
| #[cfg(feature = "std")] | ||
| fn from_utf16_lossy<'a>(input: &[u16], output: &'a mut [u8]) -> &'a str { | ||
| let mut output_len = 0; | ||
| for c in UStr::from_slice(input).chars_lossy().take_while(|&x| x != '\0') { |
There was a problem hiding this comment.
Would it be possible to use core::char::decode_utf16 here? To get lossy behavior, you can run it through .map(|r| r.unwrap_or(core::char::REPLACEMENT_CHARACTER)).
If so, that would eliminated the need for the widestring dependency, which would avoid the MSRV issue.
lambda-fairy
approved these changes
May 13, 2022
lambda-fairy
added a commit
that referenced
this pull request
May 13, 2022
Merged
lambda-fairy
added a commit
that referenced
this pull request
May 13, 2022
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.
No description provided.