Rollup merge of rust-lang#89322 - tmiasko:rm-optimization-fuel, r=mic…

…haelwoerister

Reapply "Remove optimization_fuel_crate from Session"

compiler/rustc_session/src/session.rs

@@ -162,9 +162,6 @@ pub struct Session {
  /// Data about code being compiled, gathered during compilation.
  pub code_stats: CodeStats,
 
- /// If `-zfuel=crate=n` is specified, `Some(crate)`.
- optimization_fuel_crate: Option<String>,
-
  /// Tracks fuel info if `-zfuel=crate=n` is specified.
  optimization_fuel: Lock<OptimizationFuel>,
 
@@ -882,7 +879,7 @@ impl Session {
  /// This expends fuel if applicable, and records fuel if applicable.
  pub fn consider_optimizing<T: Fn() -> String>(&self, crate_name: &str, msg: T) -> bool {
  let mut ret = true;
- if let Some(ref c) = self.optimization_fuel_crate {
+ if let Some((ref c, _)) = self.opts.debugging_opts.fuel {
  if c == crate_name {
  assert_eq!(self.threads(), 1);
  let mut fuel = self.optimization_fuel.lock();
@@ -1260,7 +1257,6 @@ pub fn build_session(
  let local_crate_source_file =
  local_crate_source_file.map(|path| file_path_mapping.map_prefix(path).0);
 
- let optimization_fuel_crate = sopts.debugging_opts.fuel.as_ref().map(|i| i.0.clone());
  let optimization_fuel = Lock::new(OptimizationFuel {
  remaining: sopts.debugging_opts.fuel.as_ref().map_or(0, |i| i.1),
  out_of_fuel: false,
@@ -1311,7 +1307,6 @@ pub fn build_session(
  normalize_projection_ty: AtomicUsize::new(0),
  },
  code_stats: Default::default(),
- optimization_fuel_crate,
  optimization_fuel,
  print_fuel,
  jobserver: jobserver::client(),