Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to clap 3.1.0 #1016

Merged
merged 2 commits into from Feb 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion gen/cmd/Cargo.toml
Expand Up @@ -21,7 +21,7 @@ path = "src/main.rs"
experimental-async-fn = []

[dependencies]
clap = { version = "3.0", default-features = false, features = ["std", "suggestions"] }
clap = { version = "3.1", default-features = false, features = ["std", "suggestions"] }
codespan-reporting = "0.11"
proc-macro2 = { version = "1.0.26", default-features = false, features = ["span-locations"] }
quote = { version = "1.0", default-features = false }
Expand Down
8 changes: 4 additions & 4 deletions gen/cmd/src/app.rs
Expand Up @@ -6,7 +6,7 @@ use super::{Opt, Output};
use crate::cfg::{self, CfgValue};
use crate::gen::include::Include;
use crate::syntax::IncludeKind;
use clap::{App, AppSettings, Arg};
use clap::{Arg, Command};
use std::collections::{BTreeMap as Map, BTreeSet as Set};
use std::ffi::OsStr;
use std::path::PathBuf;
Expand All @@ -33,11 +33,11 @@ OPTIONS:
{options}\
";

fn app() -> App<'static> {
let mut app = App::new("cxxbridge")
fn app() -> Command<'static> {
let mut app = Command::new("cxxbridge")
.override_usage(USAGE)
.help_template(TEMPLATE)
.setting(AppSettings::NextLineHelp)
.next_line_help(true)
.arg(arg_input())
.arg(arg_cxx_impl_annotations())
.arg(arg_header())
Expand Down
2 changes: 1 addition & 1 deletion third-party/BUCK
Expand Up @@ -15,7 +15,7 @@ rust_library(

rust_library(
name = "clap",
srcs = glob(["vendor/clap-3.0.14/src/**"]),
srcs = glob(["vendor/clap-3.1.0/src/**"]),
features = ["std"],
visibility = ["PUBLIC"],
deps = [
Expand Down
2 changes: 1 addition & 1 deletion third-party/BUILD
Expand Up @@ -18,7 +18,7 @@ rust_library(

rust_library(
name = "clap",
srcs = glob(["vendor/clap-3.0.14/src/**"]),
srcs = glob(["vendor/clap-3.1.0/src/**"]),
crate_features = ["std"],
visibility = ["//visibility:public"],
deps = [
Expand Down
4 changes: 2 additions & 2 deletions third-party/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.