Avoid a track_errors by bubbling up most errors from `check_well_fo…

…rmed`

compiler/rustc_data_structures/src/sync.rs

@@ -54,7 +54,7 @@ pub use worker_local::{Registry, WorkerLocal};
 mod parallel;
 #[cfg(parallel_compiler)]
 pub use parallel::scope;
-pub use parallel::{join, par_for_each_in, par_map, parallel_guard};
+pub use parallel::{join, par_for_each_in, par_map, parallel_guard, try_par_for_each_in};
 
 pub use std::sync::atomic::Ordering;
 pub use std::sync::atomic::Ordering::SeqCst;

compiler/rustc_data_structures/src/sync/parallel.rs

@@ -77,6 +77,15 @@ mod disabled {
  })
  }
 
+ pub fn try_par_for_each_in<T: IntoIterator, E: Copy>(
+ t: T,
+ mut for_each: impl FnMut(T::Item) -> Result<(), E>,
+ ) -> Result<(), E> {
+ parallel_guard(|guard| {
+ t.into_iter().fold(Ok(()), |ret, i| guard.run(|| for_each(i)).unwrap_or(ret).and(ret))
+ })
+ }
+
  pub fn par_map<T: IntoIterator, R, C: FromIterator<R>>(
  t: T,
  mut map: impl FnMut(<<T as IntoIterator>::IntoIter as Iterator>::Item) -> R,
@@ -167,6 +176,22 @@ mod enabled {
  });
  }
 
+ pub fn try_par_for_each_in<I, T: IntoIterator<Item = I> + IntoParallelIterator<Item = I>, E>(
+ t: T,
+ for_each: impl Fn(I) -> Result<(), E> + DynSync + DynSend,
+ ) -> Result<(), E> {
+ parallel_guard(|guard| {
+ if mode::is_dyn_thread_safe() {
+ let for_each = FromDyn::from(for_each);
+ t.into_par_iter()
+ .fold(Ok(()), |ret, i| guard.run(|| for_each(i)).unwrap_or(ret).and(ret))
+ } else {
+ t.into_iter()
+ .fold(Ok(()), |ret, i| guard.run(|| for_each(i)).unwrap_or(ret).and(ret))
+ }
+ });
+ }
+
  pub fn par_map<
  I,
  T: IntoIterator<Item = I> + IntoParallelIterator<Item = I>,