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

Remove unused macro argument

Browse Source
This commit is contained in:
Oli Scherer 2022-10-13 07:38:29 +00:00
parent 0227d8d555
commit c4b9b6532b
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/bootstrap/tool.rs
View File

@ -794,9 +794,9 @@ macro_rules! tool_extended {
$($name:ident, $($name:ident,
$path:expr, $path:expr,
$tool_name:expr, $tool_name:expr,
stable = $stable:expr, stable = $stable:expr
$(tool_std = $tool_std:literal,)? $(,tool_std = $tool_std:literal)?
$extra_deps:block;)+) => { ;)+) => {
$( $(
#[derive(Debug, Clone, Hash, PartialEq, Eq)] #[derive(Debug, Clone, Hash, PartialEq, Eq)]
pub struct $name { pub struct $name {
@ -838,7 +838,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
$builder.ensure(ToolBuild { $builder.ensure(ToolBuild {
compiler: $sel.compiler, compiler: $sel.compiler,
target: $sel.target, target: $sel.target,
@ -860,17 +859,17 @@ 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, "src/tools/rustfmt", "cargo-fmt", stable=true, {}; Cargofmt, "src/tools/rustfmt", "cargo-fmt", stable=true;
CargoClippy, "src/tools/clippy", "cargo-clippy", stable=true, {}; CargoClippy, "src/tools/clippy", "cargo-clippy", stable=true;
Clippy, "src/tools/clippy", "clippy-driver", stable=true, {}; Clippy, "src/tools/clippy", "clippy-driver", stable=true;
Miri, "src/tools/miri", "miri", stable=false, {}; Miri, "src/tools/miri", "miri", stable=false;
CargoMiri, "src/tools/miri/cargo-miri", "cargo-miri", stable=true, {}; CargoMiri, "src/tools/miri/cargo-miri", "cargo-miri", stable=true;
// 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.
Rls, "src/tools/rls", "rls", stable=true, tool_std=true, {}; Rls, "src/tools/rls", "rls", stable=true, tool_std=true;
RustDemangler, "src/tools/rust-demangler", "rust-demangler", stable=false, tool_std=true, {}; RustDemangler, "src/tools/rust-demangler", "rust-demangler", stable=false, tool_std=true;
Rustfmt, "src/tools/rustfmt", "rustfmt", stable=true, {}; Rustfmt, "src/tools/rustfmt", "rustfmt", stable=true;
); );
impl<'a> Builder<'a> { impl<'a> Builder<'a> {