Skip to content

lower the msrv of sap to 1.85.0 #5

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Jun 2, 2025
Merged

lower the msrv of sap to 1.85.0 #5

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5d16973
use `core::str::from_utf8` instead of unstable `str::from_utf8`
imnotpoz May 31, 2025
b345c74
remove todo comments and add comments with the rust version
imnotpoz May 31, 2025
30f3048
fix comments and add links
imnotpoz May 31, 2025
dfa381d
use feature name in comments
imnotpoz May 31, 2025
2228cb5
use `String::from_utf8_lossy` instead of `OsStr::display`
imnotpoz May 31, 2025
7ac20ce
update comments to add the new way of doing things
imnotpoz May 31, 2025
e5ef054
use the proper old way in the comment
imnotpoz May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,11 @@ where
// however the user
// can be as bright as Proxima Centauri
// or as dark as Sagittarius A
let str_arg = match str::from_utf8(arg) {
//
// `inherent_str_constructors` is not stabilised yet
// https://github.com/rust-lang/rust/issues/131114
// use `str::from_utf8(arg)` if you don't care about stable rust
let str_arg = match core::str::from_utf8(arg) {
Err(_e) => {
let err = ParsingError::InvalidString;
return Err(err);
Expand Down Expand Up @@ -257,7 +261,12 @@ where
// might not be needed,
// however i am not sure of the user's
// eternal glory and shine
let str_arg = match str::from_utf8(arg.as_encoded_bytes()) {
//
// `inherent_str_constructors` is not stabilised yet
// https://github.com/rust-lang/rust/issues/131114
// use `str::from_utf8(arg.as_encoded_bytes())`
// if you don't care about stable rust
let str_arg = match core::str::from_utf8(arg.as_encoded_bytes()) {
Err(_e) => {
let err = ParsingError::InvalidString;
return Err(err);
Expand Down Expand Up @@ -353,14 +362,20 @@ impl Display for ParsingError {
Self::InvalidOption { reason, offender } => {
let reserve = write!(f, "reason: {reason}");
if let Some(sentence) = offender {
return write!(f, " at: {}", sentence.display());
// `os_str_display` is stabilised in 1.87.0
// https://github.com/rust-lang/rust/issues/120048
// use `sentence.display()` if you don't care about rust <1.87.0
return write!(f, " at: {}", String::from_utf8_lossy(sentence.as_bytes()));
}

reserve
}

Self::UnconsumedValue { value } => {
write!(f, "leftover value: {}", value.display())
// `os_str_display` is stabilised in 1.87.0
// https://github.com/rust-lang/rust/issues/120048
// use `value.display()` if you don't care about rust <1.87.0
write!(f, "leftover value: {}", String::from_utf8_lossy(value.as_bytes()))
}

Self::UnexpectedArg {
Expand Down