diff options
| author | Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com> | 2025-03-10 15:57:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-10 15:57:22 +0100 |
| commit | 44ec67fffbe9f7846d00cf8a0d457cfc681fea08 (patch) | |
| tree | b95874b3300e1579fca2f78dfd200eb55ea1361c /compiler/rustc_data_structures/src/sync/parallel.rs | |
| parent | 2abeceeb97f180bec3a331b240160c240285dd89 (diff) | |
| parent | 063ef18fdc10cb0eb49e1af855e1a8e807e73eed (diff) | |
| download | rust-44ec67fffbe9f7846d00cf8a0d457cfc681fea08.tar.gz rust-44ec67fffbe9f7846d00cf8a0d457cfc681fea08.zip | |
Rollup merge of #138306 - jieyouxu:revert-workspace-lints, r=Noratrieb
Revert "Use workspace lints for crates in `compiler/` #138084" Revert <https://github.com/rust-lang/rust/pull/138084> to buy time to consider options that avoids breaking downstream usages of cargo on distributed `rustc-src` artifacts, where such cargo invocations fail due to inability to inherit `lints` from workspace root manifest's `workspace.lints` (this is only valid for the source rust-lang/rust workspace, but not really the distributed `rustc-src` artifacts). The problem is that the `rustc-src` component doesn't include the root `Cargo.toml` manifest. This breakage was reported in https://github.com/rust-lang/rust/issues/138304. This reverts commit 48caf81484b50dca5a5cebb614899a3df81ca898, reversing changes made to c6662879b27f5161e95f39395e3c9513a7b97028. cc `@RalfJung` r? `@nnethercote` (sorry, I didn't consider this being a thing 💀)
Diffstat (limited to 'compiler/rustc_data_structures/src/sync/parallel.rs')
| -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, |