rust-lang · bors · Jan 9, 2024 · Dec 8, 2023 · Dec 22, 2023 · Dec 22, 2023
diff --git a/compiler/rustc_data_structures/src/sync.rs b/compiler/rustc_data_structures/src/sync.rs
@@ -56,9 56,6 @@ mod parallel;
 pub use parallel::scope;
 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;
-
 pub use vec::{AppendOnlyIndexVec, AppendOnlyVec};
 
 mod vec;
@@ -67,8 64,7 @@ mod freeze;
 pub use freeze::{FreezeLock, FreezeReadGuard, FreezeWriteGuard};
 
 mod mode {
- use super::Ordering;
- use std::sync::atomic::AtomicU8;
  use std::sync::atomic::{AtomicU8, Ordering};
 
  const UNINITIALIZED: u8 = 0;
  const DYN_NOT_THREAD_SAFE: u8 = 1;
@@ -113,6 109,7 @@ cfg_match! {
  cfg(not(parallel_compiler)) => {
  use std::ops::Add;
  use std::cell::Cell;
  use std::sync::atomic::Ordering;
 
  pub unsafe auto trait Send {}
  pub unsafe auto trait Sync {}

diff --git a/compiler/rustc_driver_impl/src/lib.rs b/compiler/rustc_driver_impl/src/lib.rs
@@ -25,7 25,6 @@ use rustc_codegen_ssa::{traits::CodegenBackend, CodegenErrors, CodegenResults};
 use rustc_data_structures::profiling::{
  get_resident_set_size, print_time_passes_entry, TimePassesFormat,
 };
-use rustc_data_structures::sync::SeqCst;
 use rustc_errors::registry::{InvalidErrorCode, Registry};
 use rustc_errors::{markdown, ColorConfig};
 use rustc_errors::{DiagCtxt, ErrorGuaranteed, PResult};
@@ -476,7 475,7 @@ fn run_compiler(
  eprintln!(
  "Fuel used by {}: {}",
  sess.opts.unstable_opts.print_fuel.as_ref().unwrap(),
- sess.print_fuel.load(SeqCst)
  sess.print_fuel.load(Ordering::SeqCst)
  );
  }
 

diff --git a/compiler/rustc_query_impl/src/plumbing.rs b/compiler/rustc_query_impl/src/plumbing.rs
@@ -69,7 69,7 @@ impl QueryContext for QueryCtxt<'_> {
  fn next_job_id(self) -> QueryJobId {
  QueryJobId(
  NonZeroU64::new(
- self.query_system.jobs.fetch_add(1, rustc_data_structures::sync::Ordering::Relaxed),
  self.query_system.jobs.fetch_add(1, std::sync::atomic::Ordering::Relaxed),
  )
  .unwrap(),
  )

diff --git a/compiler/rustc_query_system/src/dep_graph/graph.rs b/compiler/rustc_query_system/src/dep_graph/graph.rs
@@ -4,7 4,7 @@ use rustc_data_structures::profiling::{EventId, QueryInvocationId, SelfProfilerR
 use rustc_data_structures::sharded::{self, Sharded};
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_data_structures::steal::Steal;
-use rustc_data_structures::sync::{AtomicU32, AtomicU64, Lock, Lrc, Ordering};
 use rustc_data_structures::sync::{AtomicU32, AtomicU64, Lock, Lrc};
 use rustc_data_structures::unord::UnordMap;
 use rustc_index::IndexVec;
 use rustc_serialize::opaque::{FileEncodeResult, FileEncoder};
@@ -13,7 13,7 @@ use std::collections::hash_map::Entry;
 use std::fmt::Debug;
 use std::hash::Hash;
 use std::marker::PhantomData;
-use std::sync::atomic::Ordering::Relaxed;
 use std::sync::atomic::Ordering;
 
 use super::query::DepGraphQuery;
 use super::serialized::{GraphEncoder, SerializedDepGraph, SerializedDepNodeIndex};
@@ -476,7 476,7 @@ impl<D: Deps> DepGraph<D> {
  let task_deps = &mut *task_deps;
 
  if cfg!(debug_assertions) {
- data.current.total_read_count.fetch_add(1, Relaxed);
  data.current.total_read_count.fetch_add(1, Ordering::Relaxed);
  }
 
  // As long as we only have a low number of reads we can avoid doing a hash
@@ -506,7 506,7 @@ impl<D: Deps> DepGraph<D> {
  }
  }
  } else if cfg!(debug_assertions) {
- data.current.total_duplicate_read_count.fetch_add(1, Relaxed);
  data.current.total_duplicate_read_count.fetch_add(1, Ordering::Relaxed);
  }
  })
  }
@@ -976,8 976,8 @@ impl<D: Deps> DepGraph<D> {
  pub fn print_incremental_info(&self) {
  if let Some(data) = &self.data {
  data.current.encoder.borrow().print_incremental_info(
- data.current.total_read_count.load(Relaxed),
- data.current.total_duplicate_read_count.load(Relaxed),
  data.current.total_read_count.load(Ordering::Relaxed),
  data.current.total_duplicate_read_count.load(Ordering::Relaxed),
  )
  }
  }
@@ -992,7 992,7 @@ impl<D: Deps> DepGraph<D> {
 
  pub(crate) fn next_virtual_depnode_index(&self) -> DepNodeIndex {
  debug_assert!(self.data.is_none());
- let index = self.virtual_dep_node_index.fetch_add(1, Relaxed);
  let index = self.virtual_dep_node_index.fetch_add(1, Ordering::Relaxed);
  DepNodeIndex::from_u32(index)
  }
 }

diff --git a/compiler/rustc_session/src/session.rs b/compiler/rustc_session/src/session.rs
@@ -14,9 14,7 @@ use rustc_data_structures::flock;
 use rustc_data_structures::fx::{FxHashMap, FxIndexSet};
 use rustc_data_structures::jobserver::{self, Client};
 use rustc_data_structures::profiling::{SelfProfiler, SelfProfilerRef};
-use rustc_data_structures::sync::{
- AtomicU64, DynSend, DynSync, Lock, Lrc, OneThread, Ordering::SeqCst,
-};
 use rustc_data_structures::sync::{AtomicU64, DynSend, DynSync, Lock, Lrc, OneThread};
 use rustc_errors::annotate_snippet_emitter_writer::AnnotateSnippetEmitter;
 use rustc_errors::emitter::{DynEmitter, HumanEmitter, HumanReadableErrorType};
 use rustc_errors::json::JsonEmitter;
@@ -44,7 42,7 @@ use std::fmt;
 use std::ops::{Div, Mul};
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
-use std::sync::{atomic::AtomicBool, Arc};
 use std::sync::{atomic::AtomicBool, atomic::Ordering::SeqCst, Arc};
 
 struct OptimizationFuel {
  /// If `-zfuel=crate=n` is specified, initially set to `n`, otherwise `0`.