diff options
| author | bors <bors@rust-lang.org> | 2025-03-10 18:38:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-10 18:38:06 +0000 |
| commit | 9fb94b32df38073bf63d009df77ed10cb1c989d0 (patch) | |
| tree | b95874b3300e1579fca2f78dfd200eb55ea1361c /compiler/rustc_data_structures/src/sync | |
| parent | 2b285cd5f0877e30ad1d83e04f8cc46254e43391 (diff) | |
| parent | 44ec67fffbe9f7846d00cf8a0d457cfc681fea08 (diff) | |
| download | rust-9fb94b32df38073bf63d009df77ed10cb1c989d0.tar.gz rust-9fb94b32df38073bf63d009df77ed10cb1c989d0.zip | |
Auto merge of #138310 - matthiaskrgr:rollup-zvbpuei, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #137931 (Add remark for missing `llvm-tools` component re. `rustc_private` linker failures related to not finding LLVM libraries) - #138138 (Pass `InferCtxt` to `InlineAsmCtxt` to properly taint on error) - #138223 (Fix post-merge workflow) - #138268 (Handle empty test suites in GitHub job summary report) - #138278 (Delegation: fix ICE with invalid `MethodCall` generation) - #138281 (Fix O(tests) stack usage in edition 2024 mergeable doctests) - #138305 (Subtree update of `rust-analyzer`) - #138306 (Revert "Use workspace lints for crates in `compiler/` #138084") r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures/src/sync')
| -rw-r--r-- | compiler/rustc_data_structures/src/sync/parallel.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_data_structures/src/sync/parallel.rs b/compiler/rustc_data_structures/src/sync/parallel.rs index 8ef8a3f3585..1ba631b8623 100644 --- a/compiler/rustc_data_structures/src/sync/parallel.rs +++ b/compiler/rustc_data_structures/src/sync/parallel.rs @@ -46,7 +46,7 @@ pub fn parallel_guard<R>(f: impl FnOnce(&ParallelGuard) -> R) -> R { ret } -fn serial_join<A, B, RA, RB>(oper_a: A, oper_b: B) -> (RA, RB) +pub fn serial_join<A, B, RA, RB>(oper_a: A, oper_b: B) -> (RA, RB) where A: FnOnce() -> RA, B: FnOnce() -> RB, |