Update to clap 3.* (#4082)
* Update to clap 3.0 This commit migrates all CLI commands internally used in this project from structopt/clap2 to clap 3. The intent here is to ensure that we're using maintained versions of the dependencies as structopt and clap 2 are less maintained nowadays. Most transitions were pretty straightforward and mostly dealing with structopt/clap3 differences. * Fix a number of `cargo deny` errors This commit fixes a few errors around duplicate dependencies which arose from the prior update to clap3. This also uses a new feature in `deny.toml`, `skip-tree`, which allows having a bit more targeted ignores for skips of duplicate version checks. This showed a few more locations in Wasmtime itself where we could update some dependencies.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
use escaping::{escape_id, handle_2big_enum_variant, NamingConvention};
|
||||
use heck::{ShoutySnakeCase, SnakeCase};
|
||||
use heck::{ToShoutySnakeCase, ToSnakeCase};
|
||||
use proc_macro2::{Ident, TokenStream};
|
||||
use quote::{format_ident, quote};
|
||||
use witx::{BuiltinType, Id, Type, TypeRef, WasmType};
|
||||
@@ -216,7 +216,7 @@ impl Names {
|
||||
/// variable. `dyn` was promoted to a strict keyword beginning in the 2018 edition.
|
||||
mod escaping {
|
||||
use {
|
||||
heck::{CamelCase, SnakeCase},
|
||||
heck::{ToSnakeCase, ToUpperCamelCase},
|
||||
proc_macro2::Ident,
|
||||
quote::format_ident,
|
||||
witx::Id,
|
||||
@@ -245,7 +245,7 @@ mod escaping {
|
||||
match (conv, id.as_str()) {
|
||||
// For camel-cased identifiers, `Self` is the only potential keyword conflict.
|
||||
(CamelCase, "self") => format_ident!("Self_"),
|
||||
(CamelCase, s) => format_ident!("{}", s.to_camel_case()),
|
||||
(CamelCase, s) => format_ident!("{}", s.to_upper_camel_case()),
|
||||
// Snake-cased identifiers are where the bulk of conflicts can occur.
|
||||
(SnakeCase, s) => {
|
||||
let s = s.to_snake_case();
|
||||
|
||||
Reference in New Issue
Block a user