mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync from rust 1fdfe1234795a289af1088aefa92ef80191cb611

Browse Source
This commit is contained in:
bjorn3 2023-12-07 14:19:46 +00:00
commit 2559532a35
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/rustc-clif.rs
View File

@ -27,7 +27,7 @@ fn main() {
args.push(codegen_backend_arg); args.push(codegen_backend_arg);
} }
if !passed_args.iter().any(|arg| { if !passed_args.iter().any(|arg| {
arg == "--sysroot" || arg.to_str().map(|s| s.starts_with("--sysroot=")) == Some(true) arg == "--sysroot" || arg.to_str().is_some_and(|s| s.starts_with("--sysroot="))
}) { }) {
args.push(OsString::from("--sysroot")); args.push(OsString::from("--sysroot"));
args.push(OsString::from(sysroot.to_str().unwrap())); args.push(OsString::from(sysroot.to_str().unwrap()));

2
scripts/rustdoc-clif.rs
View File

@ -27,7 +27,7 @@ fn main() {
args.push(codegen_backend_arg); args.push(codegen_backend_arg);
} }
if !passed_args.iter().any(|arg| { if !passed_args.iter().any(|arg| {
arg == "--sysroot" || arg.to_str().map(|s| s.starts_with("--sysroot=")) == Some(true) arg == "--sysroot" || arg.to_str().is_some_and(|s| s.starts_with("--sysroot="))
}) { }) {
args.push(OsString::from("--sysroot")); args.push(OsString::from("--sysroot"));
args.push(OsString::from(sysroot.to_str().unwrap())); args.push(OsString::from(sysroot.to_str().unwrap()));

2
src/concurrency_limiter.rs
View File

@ -64,7 +64,7 @@ impl ConcurrencyLimiter {
// Make sure to drop the mutex guard first to prevent poisoning the mutex. // Make sure to drop the mutex guard first to prevent poisoning the mutex.
drop(state); drop(state);
if let Some(err) = err { if let Some(err) = err {
handler.fatal(err).raise(); handler.fatal(err);
} else { } else {
// The error was already emitted, but compilation continued. Raise a silent // The error was already emitted, but compilation continued. Raise a silent
// fatal error. // fatal error.