user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change output of dist cargo and clippy to be consistent with other tools

Browse source
This commit is contained in:
Pietro Albini 2021-07-19 13:42:54 +02:00
parent 0c8baa729d
commit 7167f8b83f
No known key found for this signature in database
GPG key ID: CD76B35F7734769E
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/bootstrap/dist.rs
View file

@ -951,7 +951,7 @@ pub struct Cargo {
}
impl Step for Cargo {
type Output = GeneratedTarball;
type Output = Option<GeneratedTarball>;
const ONLY_HOSTS: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
@ -969,7 +969,7 @@ impl Step for Cargo {
});
}
fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
let compiler = self.compiler;
let target = self.target;
@ -994,7 +994,7 @@ impl Step for Cargo {
}
}
tarball.generate()
Some(tarball.generate())
}
}
@ -1106,7 +1106,7 @@ pub struct Clippy {
}
impl Step for Clippy {
type Output = GeneratedTarball;
type Output = Option<GeneratedTarball>;
const ONLY_HOSTS: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
@ -1124,7 +1124,7 @@ impl Step for Clippy {
});
}
fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
let compiler = self.compiler;
let target = self.target;
assert!(builder.config.extended);
@ -1145,7 +1145,7 @@ impl Step for Clippy {
tarball.add_file(clippy, "bin", 0o755);
tarball.add_file(cargoclippy, "bin", 0o755);
tarball.add_legal_and_readme_to("share/doc/clippy");
tarball.generate()
Some(tarball.generate())
}
}
@ -1374,8 +1374,8 @@ impl Step for Extended {
return;
}
tarballs.push(cargo_installer);
tarballs.push(clippy_installer);
tarballs.extend(cargo_installer);
tarballs.extend(clippy_installer);
tarballs.extend(rust_demangler_installer.clone());
tarballs.extend(rls_installer.clone());
tarballs.extend(rust_analyzer_installer.clone());

8
src/bootstrap/install.rs
View file

@ -154,7 +154,9 @@ install!((self, builder, _config),
}
};
Cargo, "cargo", Self::should_build(_config), only_hosts: true, {
let tarball = builder.ensure(dist::Cargo { compiler: self.compiler, target: self.target });
let tarball = builder
.ensure(dist::Cargo { compiler: self.compiler, target: self.target })
.expect("missing cargo");
install_sh(builder, "cargo", self.compiler.stage, Some(self.target), &tarball);
};
Rls, "rls", Self::should_build(_config), only_hosts: true, {
@ -178,7 +180,9 @@ install!((self, builder, _config),
}
};
Clippy, "clippy", Self::should_build(_config), only_hosts: true, {
let tarball = builder.ensure(dist::Clippy { compiler: self.compiler, target: self.target });
let tarball = builder
.ensure(dist::Clippy { compiler: self.compiler, target: self.target })
.expect("missing clippy");
install_sh(builder, "clippy", self.compiler.stage, Some(self.target), &tarball);
};
Miri, "miri", Self::should_build(_config), only_hosts: true, {