Simplify GitConfig

Author: Kobzol

src/bootstrap/src/core/build_steps/suggest.rs

@@ -13,8 +13,6 @@ pub fn suggest(builder: &Builder<'_>, run: bool) {
     let git_config = builder.config.git_config();
     let suggestions = builder
         .tool_cmd(Tool::SuggestTests)
-        .env("SUGGEST_TESTS_GIT_REPOSITORY", git_config.git_repository)
-        .env("SUGGEST_TESTS_NIGHTLY_BRANCH", git_config.nightly_branch)
         .env("SUGGEST_TESTS_MERGE_COMMIT_EMAIL", git_config.git_merge_commit_email)
         .run_capture_stdout(builder)
         .stdout();

src/bootstrap/src/core/build_steps/test.rs

@@ -2077,8 +2077,6 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
         }
 
         let git_config = builder.config.git_config();
-        cmd.arg("--git-repository").arg(git_config.git_repository);
-        cmd.arg("--nightly-branch").arg(git_config.nightly_branch);
         cmd.arg("--git-merge-commit-email").arg(git_config.git_merge_commit_email);
         cmd.force_coloring_in_ci();
 

src/bootstrap/src/core/config/config.rs

@@ -2801,11 +2801,7 @@ impl Config {
     }
 
     pub fn git_config(&self) -> GitConfig<'_> {
-        GitConfig {
-            git_repository: &self.stage0_metadata.config.git_repository,
-            nightly_branch: &self.stage0_metadata.config.nightly_branch,
-            git_merge_commit_email: &self.stage0_metadata.config.git_merge_commit_email,
-        }
+        GitConfig { git_merge_commit_email: &self.stage0_metadata.config.git_merge_commit_email }
     }
 
     /// Given a path to the directory of a submodule, update it.

src/bootstrap/src/lib.rs

@@ -1579,10 +1579,7 @@ Executed at: {executed_at}"#,
                 .arg("rev-list")
                 .arg("--count")
                 .arg("--merges")
-                .arg(format!(
-                    "refs/remotes/origin/{}..HEAD",
-                    self.config.stage0_metadata.config.nightly_branch
-                ))
+                .arg("refs/remotes/origin/master..HEAD")
                 .run_always()
                 .run_capture(self)
                 .stdout()

src/build_helper/src/git.rs

@@ -7,8 +7,6 @@ use std::process::{Command, Stdio};
 use crate::ci::CiEnv;
 
 pub struct GitConfig<'a> {
-    pub git_repository: &'a str,
-    pub nightly_branch: &'a str,
     pub git_merge_commit_email: &'a str,
 }
 

src/build_helper/src/stage0_parser.rs

@@ -20,8 +20,6 @@ pub struct Stage0Config {
     pub artifacts_server: String,
     pub artifacts_with_llvm_assertions_server: String,
     pub git_merge_commit_email: String,
-    pub git_repository: String,
-    pub nightly_branch: String,
 }
 
 pub fn parse_stage0_file() -> Stage0 {
@@ -49,8 +47,6 @@ pub fn parse_stage0_file() -> Stage0 {
                 stage0.config.artifacts_with_llvm_assertions_server = value.to_owned()
             }
             "git_merge_commit_email" => stage0.config.git_merge_commit_email = value.to_owned(),
-            "git_repository" => stage0.config.git_repository = value.to_owned(),
-            "nightly_branch" => stage0.config.nightly_branch = value.to_owned(),
 
             "compiler_date" => stage0.compiler.date = value.to_owned(),
             "compiler_version" => stage0.compiler.version = value.to_owned(),

src/stage0

@@ -2,8 +2,6 @@ dist_server=https://static.rust-lang.org
 artifacts_server=https://ci-artifacts.rust-lang.org/rustc-builds
 artifacts_with_llvm_assertions_server=https://ci-artifacts.rust-lang.org/rustc-builds-alt
 git_merge_commit_email=bors@rust-lang.org
-git_repository=rust-lang/rust
-nightly_branch=master
 
 # The configuration above this comment is editable, and can be changed
 # by forks of the repository if they have alternate values.
@@ -478,4 +476,4 @@ dist/2025-02-18/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz=e63d13a6acd596ebfd
 dist/2025-02-18/rustc-nightly-x86_64-unknown-linux-musl.tar.gz=b7bee098c32b321551f68e96e002f85e3a0323c864aa7f65641a58ae24f4238e
 dist/2025-02-18/rustc-nightly-x86_64-unknown-linux-musl.tar.xz=e5c22c2fab89c7ba548b11104c54e8f82cafb1979ba73a318682bb10ed9e4fb9
 dist/2025-02-18/rustc-nightly-x86_64-unknown-netbsd.tar.gz=7bf40bffe95437244f6f8a5fde69499f42d2b716e166115530fbcdbdcd837887
-dist/2025-02-18/rustc-nightly-x86_64-unknown-netbsd.tar.xz=0adeaa382f289233ffc9229e116a340ac03a861f0fdbb5bd35aaf5d0d7370877
+dist/2025-02-18/rustc-nightly-x86_64-unknown-netbsd.tar.xz=0adeaa382f289233ffc9229e116a340ac03a861f0fdbb5bd35aaf5d0d7370877

src/tools/compiletest/src/common.rs

@@ -397,9 +397,7 @@ pub struct Config {
 
     pub nocapture: bool,
 
-    // Needed both to construct build_helper::git::GitConfig
-    pub git_repository: String,
-    pub nightly_branch: String,
+    // Needed to construct build_helper::git::GitConfig
     pub git_merge_commit_email: String,
 
     /// True if the profiler runtime is enabled for this target.
@@ -499,11 +497,7 @@ impl Config {
     }
 
     pub fn git_config(&self) -> GitConfig<'_> {
-        GitConfig {
-            git_repository: &self.git_repository,
-            nightly_branch: &self.nightly_branch,
-            git_merge_commit_email: &self.git_merge_commit_email,
-        }
+        GitConfig { git_merge_commit_email: &self.git_merge_commit_email }
     }
 
     pub fn has_subprocess_support(&self) -> bool {

src/tools/compiletest/src/lib.rs

@@ -424,8 +424,6 @@ pub fn parse_config(args: Vec<String>) -> Config {
 
         nocapture: matches.opt_present("no-capture"),
 
-        git_repository: matches.opt_str("git-repository").unwrap(),
-        nightly_branch: matches.opt_str("nightly-branch").unwrap(),
         git_merge_commit_email: matches.opt_str("git-merge-commit-email").unwrap(),
 
         profiler_runtime: matches.opt_present("profiler-runtime"),

src/tools/suggest-tests/src/main.rs

@@ -5,11 +5,7 @@ use suggest_tests::get_suggestions;
 
 fn main() -> ExitCode {
     let modified_files = get_git_modified_files(
-        &GitConfig {
-            git_repository: &env("SUGGEST_TESTS_GIT_REPOSITORY"),
-            nightly_branch: &env("SUGGEST_TESTS_NIGHTLY_BRANCH"),
-            git_merge_commit_email: &env("SUGGEST_TESTS_MERGE_COMMIT_EMAIL"),
-        },
+        &GitConfig { git_merge_commit_email: &env("SUGGEST_TESTS_MERGE_COMMIT_EMAIL") },
         None,
         &Vec::new(),
     );