mirror of
https://github.com/rust-lang/rust.git
synced 2026-05-21 17:52:12 +03:00
Remove git_repository field from GitConfig
It is no longer needed after a recent refactoring.
This commit is contained in:
@@ -13,7 +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)
|
||||
|
||||
@@ -2064,7 +2064,6 @@ fn run(self, builder: &Builder<'_>) {
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
@@ -2963,7 +2963,6 @@ pub fn default_codegen_backend(&self, target: TargetSelection) -> Option<String>
|
||||
|
||||
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,
|
||||
}
|
||||
|
||||
@@ -135,7 +135,6 @@ fn git_cmd(&self) -> Command {
|
||||
|
||||
fn git_config(&self) -> GitConfig<'_> {
|
||||
GitConfig {
|
||||
git_repository: &self.git_repo,
|
||||
nightly_branch: &self.nightly_branch,
|
||||
git_merge_commit_email: &self.merge_bot_email,
|
||||
}
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct GitConfig<'a> {
|
||||
pub git_repository: &'a str,
|
||||
pub nightly_branch: &'a str,
|
||||
pub git_merge_commit_email: &'a str,
|
||||
}
|
||||
|
||||
@@ -20,7 +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,
|
||||
}
|
||||
|
||||
@@ -49,7 +48,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(),
|
||||
|
||||
@@ -61,7 +61,6 @@ fn update_stage0_file(mut self) -> Result<(), Error> {
|
||||
artifacts_server,
|
||||
artifacts_with_llvm_assertions_server,
|
||||
git_merge_commit_email,
|
||||
git_repository,
|
||||
nightly_branch,
|
||||
} = &self.config;
|
||||
|
||||
@@ -72,7 +71,6 @@ fn update_stage0_file(mut self) -> Result<(), Error> {
|
||||
artifacts_with_llvm_assertions_server
|
||||
));
|
||||
file_content.push_str(&format!("git_merge_commit_email={}\n", git_merge_commit_email));
|
||||
file_content.push_str(&format!("git_repository={}\n", git_repository));
|
||||
file_content.push_str(&format!("nightly_branch={}\n", nightly_branch));
|
||||
|
||||
file_content.push_str("\n");
|
||||
|
||||
@@ -399,7 +399,6 @@ pub struct Config {
|
||||
pub nocapture: bool,
|
||||
|
||||
// Needed both to construct build_helper::git::GitConfig
|
||||
pub git_repository: String,
|
||||
pub nightly_branch: String,
|
||||
pub git_merge_commit_email: String,
|
||||
|
||||
@@ -511,7 +510,6 @@ pub fn has_asm_support(&self) -> bool {
|
||||
|
||||
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,
|
||||
}
|
||||
|
||||
@@ -175,7 +175,6 @@ fn build(&mut self) -> Config {
|
||||
self.host.as_deref().unwrap_or("x86_64-unknown-linux-gnu"),
|
||||
"--target",
|
||||
self.target.as_deref().unwrap_or("x86_64-unknown-linux-gnu"),
|
||||
"--git-repository=",
|
||||
"--nightly-branch=",
|
||||
"--git-merge-commit-email=",
|
||||
"--minicore-path=",
|
||||
|
||||
@@ -188,7 +188,6 @@ pub fn parse_config(args: Vec<String>) -> Config {
|
||||
"run tests which rely on commit version being compiled into the binaries",
|
||||
)
|
||||
.optopt("", "edition", "default Rust edition", "EDITION")
|
||||
.reqopt("", "git-repository", "name of the git repository", "ORG/REPO")
|
||||
.reqopt("", "nightly-branch", "name of the git branch for nightly", "BRANCH")
|
||||
.reqopt(
|
||||
"",
|
||||
@@ -440,7 +439,6 @@ fn opt_path(m: &getopts::Matches, nm: &str) -> Utf8PathBuf {
|
||||
|
||||
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(),
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
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"),
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user