Skip to content

Commit 580fa0c

Browse files
committed
rename github_repository to git_repository
1 parent 4a08735 commit 580fa0c

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

Diff for: src/bootstrap/src/core/build_steps/suggest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub fn suggest(builder: &Builder<'_>, run: bool) {
1212
let git_config = builder.config.git_config();
1313
let suggestions = builder
1414
.tool_cmd(Tool::SuggestTests)
15-
.env("SUGGEST_TESTS_GITHUB_REPOSITORY", git_config.github_repository)
15+
.env("SUGGEST_TESTS_GIT_REPOSITORY", git_config.git_repository)
1616
.env("SUGGEST_TESTS_NIGHTLY_BRANCH", git_config.nightly_branch)
1717
.output()
1818
.expect("failed to run `suggest-tests` tool");

Diff for: src/bootstrap/src/core/build_steps/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1874,7 +1874,7 @@ note: if you're sure you want to do this, please open an issue as to why. In the
18741874
}
18751875

18761876
let git_config = builder.config.git_config();
1877-
cmd.arg("--github-repository").arg(git_config.github_repository);
1877+
cmd.arg("--git-repository").arg(git_config.git_repository);
18781878
cmd.arg("--nightly-branch").arg(git_config.nightly_branch);
18791879

18801880
builder.ci_env.force_coloring_in_ci(&mut cmd);

Diff for: src/bootstrap/src/core/config/config.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ pub struct Stage0Config {
319319
pub artifacts_server: String,
320320
pub artifacts_with_llvm_assertions_server: String,
321321
pub git_merge_commit_email: String,
322-
pub github_repository: String,
322+
pub git_repository: String,
323323
pub nightly_branch: String,
324324
}
325325
#[derive(Default, Deserialize, Clone)]
@@ -2009,7 +2009,7 @@ impl Config {
20092009

20102010
pub fn git_config(&self) -> GitConfig<'_> {
20112011
GitConfig {
2012-
github_repository: &self.stage0_metadata.config.github_repository,
2012+
git_repository: &self.stage0_metadata.config.git_repository,
20132013
nightly_branch: &self.stage0_metadata.config.nightly_branch,
20142014
}
20152015
}

Diff for: src/stage0.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"artifacts_server": "https://ci-artifacts.rust-lang.org/rustc-builds",
55
"artifacts_with_llvm_assertions_server": "https://ci-artifacts.rust-lang.org/rustc-builds-alt",
66
"git_merge_commit_email": "[email protected]",
7-
"github_repository": "rust-lang/rust",
7+
"git_repository": "rust-lang/rust",
88
"nightly_branch": "master"
99
},
1010
"__comments": [

Diff for: src/tools/build_helper/src/git.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::process::Stdio;
22
use std::{path::Path, process::Command};
33

44
pub struct GitConfig<'a> {
5-
pub github_repository: &'a str,
5+
pub git_repository: &'a str,
66
pub nightly_branch: &'a str,
77
}
88

@@ -45,8 +45,8 @@ pub fn get_rust_lang_rust_remote(
4545

4646
let rust_lang_remote = stdout
4747
.lines()
48-
.find(|remote| remote.contains(config.github_repository))
49-
.ok_or_else(|| format!("{} remote not found", config.github_repository))?;
48+
.find(|remote| remote.contains(config.git_repository))
49+
.ok_or_else(|| format!("{} remote not found", config.git_repository))?;
5050

5151
let remote_name =
5252
rust_lang_remote.split('.').nth(1).ok_or_else(|| "remote name not found".to_owned())?;

Diff for: src/tools/compiletest/src/common.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ pub struct Config {
373373
pub nocapture: bool,
374374

375375
// Needed both to construct build_helper::git::GitConfig
376-
pub github_repository: String,
376+
pub git_repository: String,
377377
pub nightly_branch: String,
378378
}
379379

@@ -449,7 +449,7 @@ impl Config {
449449

450450
pub fn git_config(&self) -> GitConfig<'_> {
451451
GitConfig {
452-
github_repository: &self.github_repository,
452+
git_repository: &self.git_repository,
453453
nightly_branch: &self.nightly_branch,
454454
}
455455
}

Diff for: src/tools/compiletest/src/header/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ impl ConfigBuilder {
126126
self.host.as_deref().unwrap_or("x86_64-unknown-linux-gnu"),
127127
"--target",
128128
self.target.as_deref().unwrap_or("x86_64-unknown-linux-gnu"),
129-
"--github-repository=",
129+
"--git-repository=",
130130
"--nightly-branch=",
131131
];
132132
let mut args: Vec<String> = args.iter().map(ToString::to_string).collect();

Diff for: src/tools/compiletest/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
145145
.reqopt("", "channel", "current Rust channel", "CHANNEL")
146146
.optflag("", "git-hash", "run tests which rely on commit version being compiled into the binaries")
147147
.optopt("", "edition", "default Rust edition", "EDITION")
148-
.reqopt("", "github-repository", "name of the GitHub repository", "ORG/REPO")
148+
.reqopt("", "git-repository", "name of the git repository", "ORG/REPO")
149149
.reqopt("", "nightly-branch", "name of the git branch for nightly", "BRANCH");
150150

151151
let (argv0, args_) = args.split_first().unwrap();
@@ -310,7 +310,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
310310

311311
nocapture: matches.opt_present("nocapture"),
312312

313-
github_repository: matches.opt_str("github-repository").unwrap(),
313+
git_repository: matches.opt_str("git-repository").unwrap(),
314314
nightly_branch: matches.opt_str("nightly-branch").unwrap(),
315315
}
316316
}

Diff for: src/tools/suggest-tests/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use suggest_tests::get_suggestions;
66
fn main() -> ExitCode {
77
let modified_files = get_git_modified_files(
88
&GitConfig {
9-
github_repository: &env("SUGGEST_TESTS_GITHUB_REPOSITORY"),
9+
git_repository: &env("SUGGEST_TESTS_GIT_REPOSITORY"),
1010
nightly_branch: &env("SUGGEST_TESTS_NIGHTLY_BRANCH"),
1111
},
1212
None,

0 commit comments

Comments
 (0)