diff options
| author | bors <bors@rust-lang.org> | 2024-12-14 03:55:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-14 03:55:47 +0000 |
| commit | a1740a9c3568e856f6aa12d83e008d38c9749d4b (patch) | |
| tree | 9830a58a9a9a6f2b70c34a550e91e6fc80fe75e7 /compiler/rustc_data_structures/src | |
| parent | 4a204bebdfd5cbc3e7edabf41cda3c3ff8b74917 (diff) | |
| parent | 75e778991ec9d07bba422645c2a148829bf9d0f3 (diff) | |
| download | rust-a1740a9c3568e856f6aa12d83e008d38c9749d4b.tar.gz rust-a1740a9c3568e856f6aa12d83e008d38c9749d4b.zip | |
Auto merge of #134292 - matthiaskrgr:rollup-3kbjocl, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #134181 (Tweak multispan rendering to reduce output length) - #134209 (validate `--skip` and `--exclude` paths) - #134231 (rustdoc-search: fix mismatched path when parent re-exported twice) - #134236 (crashes: more tests v2) - #134240 (Only dist `llvm-objcopy` if llvm tools are enabled) - #134244 (rustc_borrowck: Stop suggesting the invalid syntax `&mut raw const`) - #134251 (A bunch of cleanups (part 2)) - #134256 (Use a more precise span in placeholder_type_error_diag) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/jobserver.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_data_structures/src/jobserver.rs b/compiler/rustc_data_structures/src/jobserver.rs index d09f7efc8ff..1204f2d692d 100644 --- a/compiler/rustc_data_structures/src/jobserver.rs +++ b/compiler/rustc_data_structures/src/jobserver.rs @@ -1,6 +1,6 @@ use std::sync::{LazyLock, OnceLock}; -pub use jobserver_crate::Client; +pub use jobserver_crate::{Acquired, Client, HelperThread}; use jobserver_crate::{FromEnv, FromEnvErrorKind}; // We can only call `from_env_ext` once per process |