Merge pull request #4771 from nicholasbishop/bishop-update-bitflags

chore: Update bitflags dep to 2.0
This commit is contained in:
Ed Page 2023-03-18 20:21:54 -05:00 committed by GitHub
commit 4c05dfb8a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions

12
Cargo.lock generated
View file

@ -110,6 +110,12 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5dd14596c0e5b954530d0e6f1fd99b89c03e313aa2086e8da4303701a09e1cf"
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
version = "3.11.0" version = "3.11.0"
@ -167,7 +173,7 @@ version = "3.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
dependencies = [ dependencies = [
"bitflags", "bitflags 1.3.2",
"clap_lex 0.2.4", "clap_lex 0.2.4",
"indexmap", "indexmap",
"textwrap", "textwrap",
@ -178,7 +184,7 @@ name = "clap"
version = "4.1.10" version = "4.1.10"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"bitflags", "bitflags 2.0.1",
"clap_derive", "clap_derive",
"clap_lex 0.3.3", "clap_lex 0.3.3",
"humantime", "humantime",
@ -772,7 +778,7 @@ version = "0.36.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23" checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23"
dependencies = [ dependencies = [
"bitflags", "bitflags 1.3.2",
"errno", "errno",
"io-lifetimes", "io-lifetimes",
"libc", "libc",

View file

@ -101,7 +101,7 @@ bench = false
[dependencies] [dependencies]
clap_derive = { path = "./clap_derive", version = "=4.1.9", optional = true } clap_derive = { path = "./clap_derive", version = "=4.1.9", optional = true }
clap_lex = { path = "./clap_lex", version = "0.3.0" } clap_lex = { path = "./clap_lex", version = "0.3.0" }
bitflags = "1.2.0" bitflags = "2.0.0"
unicase = { version = "2.6.0", optional = true } unicase = { version = "2.6.0", optional = true }
strsim = { version = "0.10.0", optional = true } strsim = { version = "0.10.0", optional = true }
is-terminal = { version = "0.4.1", optional = true } is-terminal = { version = "0.4.1", optional = true }

View file

@ -63,6 +63,7 @@ pub(crate) enum AppSettings {
} }
bitflags! { bitflags! {
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
struct Flags: u64 { struct Flags: u64 {
const SC_NEGATE_REQS = 1; const SC_NEGATE_REQS = 1;
const SC_REQUIRED = 1 << 1; const SC_REQUIRED = 1 << 1;

View file

@ -49,6 +49,7 @@ pub(crate) enum ArgSettings {
} }
bitflags! { bitflags! {
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
struct Flags: u32 { struct Flags: u32 {
const REQUIRED = 1; const REQUIRED = 1;
const GLOBAL = 1 << 3; const GLOBAL = 1 << 3;