diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-02-10 00:58:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-10 00:58:38 +0100 |
| commit | 317c3722848787dd7d69fff7b6930a62943aea74 (patch) | |
| tree | ebc1079b48167ebfb8d148e635d225c6f7aef3bc /compiler/rustc_data_structures/src | |
| parent | 34489b776904f4ec2e3526a66650caf90261b031 (diff) | |
| parent | 83f3bc42714250633cacadcde8b15da28bf443f0 (diff) | |
| download | rust-317c3722848787dd7d69fff7b6930a62943aea74.tar.gz rust-317c3722848787dd7d69fff7b6930a62943aea74.zip | |
Rollup merge of #120846 - petrochenkov:jobs, r=oli-obk
Update jobserver-rs to 0.1.28 Fixes the issues found in https://github.com/rust-lang/rust/issues/120515 besides the diagnostic wording.
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/jobserver.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/rustc_data_structures/src/jobserver.rs b/compiler/rustc_data_structures/src/jobserver.rs index 412e33aaa65..89088bc5c1b 100644 --- a/compiler/rustc_data_structures/src/jobserver.rs +++ b/compiler/rustc_data_structures/src/jobserver.rs @@ -23,7 +23,10 @@ static GLOBAL_CLIENT: LazyLock<Result<Client, String>> = LazyLock::new(|| { if matches!( error.kind(), - FromEnvErrorKind::NoEnvVar | FromEnvErrorKind::NoJobserver | FromEnvErrorKind::Unsupported + FromEnvErrorKind::NoEnvVar + | FromEnvErrorKind::NoJobserver + | FromEnvErrorKind::NegativeFd + | FromEnvErrorKind::Unsupported ) { return Ok(default_client()); } |