Revert "Rollup merge of rust-lang#125930 - weihanglo:opt-dist-respect-cargo-config, r=Kobzol"

This reverts commit 610592b, reversing
changes made to d9e149d.

Author: workingjubilee

src/tools/opt-dist/src/environment.rs

@@ -17,9 +17,6 @@ pub struct Environment {
     host_llvm_dir: Utf8PathBuf,
     /// List of test paths that should be skipped when testing the optimized artifacts.
     skipped_tests: Vec<String>,
-    /// Arguments passed to `rustc-perf --cargo-config <value>` when running benchmarks.
-    #[builder(default)]
-    benchmark_cargo_config: Vec<String>,
     /// Directory containing a pre-built rustc-perf checkout.
     #[builder(default)]
     prebuilt_rustc_perf: Option<Utf8PathBuf>,
@@ -97,10 +94,6 @@ impl Environment {
     pub fn skipped_tests(&self) -> &[String] {
         &self.skipped_tests
     }
-
-    pub fn benchmark_cargo_config(&self) -> &[String] {
-        &self.benchmark_cargo_config
-    }
 }
 
 /// What is the extension of binary executables on this platform?

src/tools/opt-dist/src/main.rs

@@ -90,10 +90,6 @@ enum EnvironmentCmd {
 
         #[clap(flatten)]
         shared: SharedArgs,
-
-        /// Arguments passed to `rustc-perf --cargo-config <value>` when running benchmarks.
-        #[arg(long)]
-        benchmark_cargo_config: Vec<String>,
     },
     /// Perform an optimized build on Linux CI, from inside Docker.
     LinuxCi {
@@ -123,7 +119,6 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
             llvm_shared,
             use_bolt,
             skipped_tests,
-            benchmark_cargo_config,
             shared,
         } => {
             let env = EnvironmentBuilder::default()
@@ -137,7 +132,6 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
                 .shared_llvm(llvm_shared)
                 .use_bolt(use_bolt)
                 .skipped_tests(skipped_tests)
-                .benchmark_cargo_config(benchmark_cargo_config)
                 .build()?;
 
             (env, shared.build_args)

src/tools/opt-dist/src/training.rs

@@ -36,7 +36,7 @@ fn init_compiler_benchmarks(
     // Run rustc-perf benchmarks
     // Benchmark using profile_local with eprintln, which essentially just means
     // don't actually benchmark -- just make sure we run rustc a bunch of times.
-    let mut cmd = cmd(&[
+    cmd(&[
         env.cargo_stage_0().as_str(),
         "run",
         "-p",
@@ -61,17 +61,7 @@ fn init_compiler_benchmarks(
     .env("RUST_LOG", "collector=debug")
     .env("RUSTC", env.rustc_stage_0().as_str())
     .env("RUSTC_BOOTSTRAP", "1")
-    .workdir(&env.rustc_perf_dir());
-
-    // This propagates cargo configs to `rustc-perf --cargo-config`,
-    // which is particularly useful when the environment is air-gapped,
-    // and you want to use the default set of training crates vendored
-    // in the rustc-src tarball.
-    for config in env.benchmark_cargo_config() {
-        cmd = cmd.arg("--cargo-config").arg(config);
-    }
-
-    cmd
+    .workdir(&env.rustc_perf_dir())
 }
 
 /// Describes which `llvm-profdata` binary should be used for merging PGO profiles.