mirror of
https://github.com/rust-lang/rust.git
synced 2026-05-16 13:05:18 +03:00
Remove src_is_git, instead call method on rust_info directly.
This commit is contained in:
@@ -101,4 +101,8 @@ pub fn version(&self, build: &Build, num: &str) -> String {
|
||||
}
|
||||
version
|
||||
}
|
||||
|
||||
pub fn is_git(&self) -> bool {
|
||||
self.inner.is_some()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -623,7 +623,7 @@ pub fn plain_source_tarball(build: &Build) {
|
||||
write_file(&plain_dst_src.join("version"), build.rust_version().as_bytes());
|
||||
|
||||
// If we're building from git sources, we need to vendor a complete distribution.
|
||||
if build.src_is_git {
|
||||
if build.rust_info.is_git() {
|
||||
// Get cargo-vendor installed, if it isn't already.
|
||||
let mut has_cargo_vendor = false;
|
||||
let mut cmd = Command::new(&build.initial_cargo);
|
||||
|
||||
@@ -183,7 +183,6 @@ pub struct Build {
|
||||
cxx: HashMap<String, gcc::Tool>,
|
||||
crates: HashMap<String, Crate>,
|
||||
is_sudo: bool,
|
||||
src_is_git: bool,
|
||||
ci_env: CiEnv,
|
||||
delayed_failures: Cell<usize>,
|
||||
}
|
||||
@@ -262,7 +261,6 @@ pub fn new(flags: Flags, config: Config) -> Build {
|
||||
lldb_version: None,
|
||||
lldb_python_dir: None,
|
||||
is_sudo: is_sudo,
|
||||
src_is_git: src_is_git,
|
||||
ci_env: CiEnv::current(),
|
||||
delayed_failures: Cell::new(0),
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ pub fn check(build: &mut Build) {
|
||||
let mut cmd_finder = Finder::new();
|
||||
// If we've got a git directory we're gona need git to update
|
||||
// submodules and learn about various other aspects.
|
||||
if build.src_is_git {
|
||||
if build.rust_info.is_git() {
|
||||
cmd_finder.must_have("git");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user