diff options
| author | bors <bors@rust-lang.org> | 2025-03-12 17:27:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-12 17:27:43 +0000 |
| commit | 249cb84316401daf040832cdbb8a45e0f5ab6af8 (patch) | |
| tree | 6bc42cff001370399e545c50dd58965ca892bf07 /compiler/rustc_data_structures/src/sync | |
| parent | aaa2d47daebb02454fc7c08c04c3c603d5efeedb (diff) | |
| parent | 579d0587a20973bc0274d15282d6b1b95bf7e41e (diff) | |
| download | rust-249cb84316401daf040832cdbb8a45e0f5ab6af8.tar.gz rust-249cb84316401daf040832cdbb8a45e0f5ab6af8.zip | |
Auto merge of #138414 - matthiaskrgr:rollup-9ablqdb, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #137314 (change definitely unproductive cycles to error) - #137701 (Convert `ShardedHashMap` to use `hashbrown::HashTable`) - #138269 (uefi: fs: Implement FileType, FilePermissions and FileAttr) - #138331 (Use `RUSTC_LINT_FLAGS` more) - #138345 (Some autodiff cleanups) - #138387 (intrinsics: remove unnecessary leading underscore from argument names) - #138390 (fix incorrect tracing log) 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 1ba631b8623..8ef8a3f3585 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 } -pub fn serial_join<A, B, RA, RB>(oper_a: A, oper_b: B) -> (RA, RB) +fn serial_join<A, B, RA, RB>(oper_a: A, oper_b: B) -> (RA, RB) where A: FnOnce() -> RA, B: FnOnce() -> RB, |