Skip to content

Commit 317c372

Browse files
authored
Rollup merge of #120846 - petrochenkov:jobs, r=oli-obk
Update jobserver-rs to 0.1.28 Fixes the issues found in #120515 besides the diagnostic wording.
2 parents 34489b7 + 83f3bc4 commit 317c372

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -2090,9 +2090,9 @@ dependencies = [
20902090

20912091
[[package]]
20922092
name = "jobserver"
2093-
version = "0.1.27"
2093+
version = "0.1.28"
20942094
source = "registry+https://github.com/rust-lang/crates.io-index"
2095-
checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
2095+
checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
20962096
dependencies = [
20972097
"libc",
20982098
]

compiler/rustc_codegen_ssa/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ar_archive_writer = "0.1.5"
99
bitflags = "2.4.1"
1010
cc = "1.0.69"
1111
itertools = "0.11"
12-
jobserver = "0.1.27"
12+
jobserver = "0.1.28"
1313
pathdiff = "0.2.0"
1414
regex = "1.4"
1515
rustc_arena = { path = "../rustc_arena" }

compiler/rustc_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ either = "1.0"
1111
elsa = "=1.7.1"
1212
ena = "0.14.2"
1313
indexmap = { version = "2.0.0" }
14-
jobserver_crate = { version = "0.1.27", package = "jobserver" }
14+
jobserver_crate = { version = "0.1.28", package = "jobserver" }
1515
libc = "0.2"
1616
measureme = "11"
1717
rustc-hash = "1.1.0"

compiler/rustc_data_structures/src/jobserver.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ static GLOBAL_CLIENT: LazyLock<Result<Client, String>> = LazyLock::new(|| {
2323

2424
if matches!(
2525
error.kind(),
26-
FromEnvErrorKind::NoEnvVar | FromEnvErrorKind::NoJobserver | FromEnvErrorKind::Unsupported
26+
FromEnvErrorKind::NoEnvVar
27+
| FromEnvErrorKind::NoJobserver
28+
| FromEnvErrorKind::NegativeFd
29+
| FromEnvErrorKind::Unsupported
2730
) {
2831
return Ok(default_client());
2932
}

0 commit comments

Comments
 (0)