mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bootstrap: Remove some unused fields from the tool_extended macro.

Browse Source
This commit is contained in:
Eric Huss 2022-08-20 22:07:04 -07:00
parent 468887ef91
commit 12386da38a
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bootstrap/tool.rs
View File

@ -778,12 +778,10 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
macro_rules! tool_extended { macro_rules! tool_extended {
(($sel:ident, $builder:ident), (($sel:ident, $builder:ident),
$($name:ident, $($name:ident,
$toolstate:ident,
$path:expr, $path:expr,
$tool_name:expr, $tool_name:expr,
stable = $stable:expr, stable = $stable:expr,
$(in_tree = $in_tree:expr,)? $(in_tree = $in_tree:expr,)?
$(submodule = $submodule:literal,)?
$(tool_std = $tool_std:literal,)? $(tool_std = $tool_std:literal,)?
$extra_deps:block;)+) => { $extra_deps:block;)+) => {
$( $(
@ -828,7 +826,6 @@ fn make_run(run: RunConfig<'_>) {
#[allow(unused_mut)] #[allow(unused_mut)]
fn run(mut $sel, $builder: &Builder<'_>) -> Option<PathBuf> { fn run(mut $sel, $builder: &Builder<'_>) -> Option<PathBuf> {
$extra_deps $extra_deps
$( $builder.update_submodule(&Path::new("src").join("tools").join($submodule)); )?
$builder.ensure(ToolBuild { $builder.ensure(ToolBuild {
compiler: $sel.compiler, compiler: $sel.compiler,
target: $sel.target, target: $sel.target,
@ -854,12 +851,12 @@ fn run(mut $sel, $builder: &Builder<'_>) -> Option<PathBuf> {
// Note: Most submodule updates for tools are handled by bootstrap.py, since they're needed just to // Note: Most submodule updates for tools are handled by bootstrap.py, since they're needed just to
// invoke Cargo to build bootstrap. See the comment there for more details. // invoke Cargo to build bootstrap. See the comment there for more details.
tool_extended!((self, builder), tool_extended!((self, builder),
Cargofmt, rustfmt, "src/tools/rustfmt", "cargo-fmt", stable=true, in_tree=true, {}; Cargofmt, "src/tools/rustfmt", "cargo-fmt", stable=true, in_tree=true, {};
CargoClippy, clippy, "src/tools/clippy", "cargo-clippy", stable=true, in_tree=true, {}; CargoClippy, "src/tools/clippy", "cargo-clippy", stable=true, in_tree=true, {};
Clippy, clippy, "src/tools/clippy", "clippy-driver", stable=true, in_tree=true, {}; Clippy, "src/tools/clippy", "clippy-driver", stable=true, in_tree=true, {};
Miri, miri, "src/tools/miri", "miri", stable=false, {}; Miri, "src/tools/miri", "miri", stable=false, {};
CargoMiri, miri, "src/tools/miri/cargo-miri", "cargo-miri", stable=false, {}; CargoMiri, "src/tools/miri/cargo-miri", "cargo-miri", stable=false, {};
Rls, rls, "src/tools/rls", "rls", stable=true, { Rls, "src/tools/rls", "rls", stable=true, {
builder.ensure(Clippy { builder.ensure(Clippy {
compiler: self.compiler, compiler: self.compiler,
target: self.target, target: self.target,
@ -870,8 +867,8 @@ fn run(mut $sel, $builder: &Builder<'_>) -> Option<PathBuf> {
// FIXME: tool_std is not quite right, we shouldn't allow nightly features. // FIXME: tool_std is not quite right, we shouldn't allow nightly features.
// But `builder.cargo` doesn't know how to handle ToolBootstrap in stages other than 0, // But `builder.cargo` doesn't know how to handle ToolBootstrap in stages other than 0,
// and this is close enough for now. // and this is close enough for now.
RustDemangler, rust_demangler, "src/tools/rust-demangler", "rust-demangler", stable=false, in_tree=true, tool_std=true, {}; RustDemangler, "src/tools/rust-demangler", "rust-demangler", stable=false, in_tree=true, tool_std=true, {};
Rustfmt, rustfmt, "src/tools/rustfmt", "rustfmt", stable=true, in_tree=true, {}; Rustfmt, "src/tools/rustfmt", "rustfmt", stable=true, in_tree=true, {};
); );
impl<'a> Builder<'a> { impl<'a> Builder<'a> {