From 9cc468259d3a1b5273642167d588ea689f3443b7 Mon Sep 17 00:00:00 2001 From: Dmitry Savintsev Date: Thu, 1 Dec 2022 14:30:17 +0100 Subject: [PATCH] use clap arg annotation --- aya/src/lib.rs | 4 ++-- xtask/src/codegen/mod.rs | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/aya/src/lib.rs b/aya/src/lib.rs index 14f3eb2d..1f86a06b 100644 --- a/aya/src/lib.rs +++ b/aya/src/lib.rs @@ -33,8 +33,8 @@ //! [async-std]: https://docs.rs/async-std #![doc( - html_logo_url = "https://aya-rs.dev/assets/images/crabby.svg", - html_favicon_url = "https://aya-rs.dev/assets/images/crabby.svg" + html_logo_url = "https://aya-rs.dev/assets/images/crabby_dev.svg", + html_favicon_url = "https://aya-rs.dev/assets/images/crabby_dev.svg" )] #![cfg_attr(docsrs, feature(doc_cfg))] #![deny(clippy::all, missing_docs)] diff --git a/xtask/src/codegen/mod.rs b/xtask/src/codegen/mod.rs index 04157311..ab3fa96f 100644 --- a/xtask/src/codegen/mod.rs +++ b/xtask/src/codegen/mod.rs @@ -54,32 +54,32 @@ impl std::fmt::Display for Architecture { #[derive(Parser)] pub struct Options { - #[clap(long, action)] + #[arg(long, action)] libbpf_dir: PathBuf, // sysroot options. Default to ubuntu headers installed by the // libc6-dev-{arm64,armel}-cross packages. - #[clap(long, default_value = "/usr/include/x86_64-linux-gnu", action)] + #[arg(long, default_value = "/usr/include/x86_64-linux-gnu", action)] x86_64_sysroot: PathBuf, - #[clap(long, default_value = "/usr/aarch64-linux-gnu/include", action)] + #[arg(long, default_value = "/usr/aarch64-linux-gnu/include", action)] aarch64_sysroot: PathBuf, - #[clap(long, default_value = "/usr/arm-linux-gnueabi/include", action)] + #[arg(long, default_value = "/usr/arm-linux-gnueabi/include", action)] armv7_sysroot: PathBuf, - #[clap(long, default_value = "/usr/riscv64-linux-gnu/include", action)] + #[arg(long, default_value = "/usr/riscv64-linux-gnu/include", action)] riscv64_sysroot: PathBuf, - #[clap(subcommand)] + #[command(subcommand)] command: Option, } -#[derive(Parser)] +#[derive(clap::Subcommand)] enum Command { - #[clap(name = "aya")] + #[command(name = "aya")] Aya, - #[clap(name = "aya-bpf-bindings")] + #[command(name = "aya-bpf-bindings")] AyaBpfBindings, }