Update bitflags 0.8.0 -> 0.9

Author: golem131

Cargo.toml

@@ -16,7 +16,7 @@ A simple to use, efficient, and full featured  Command Line Argument Parser
 """
 
 [dependencies]
-bitflags              = "0.8.0"
+bitflags              = "0.9"
 vec_map               = "0.8"
 unicode-width         = "0.1.4"
 unicode-segmentation  = "~1.1.0" # 1.2.0 requires Rust 1.13.0

src/app/settings.rs

@@ -4,47 +4,47 @@ use std::str::FromStr;
 use std::ops::BitOr;
 
 bitflags! {
-    flags Flags: u64 {
-        const SC_NEGATE_REQS       = 1 << 0,
-        const SC_REQUIRED          = 1 << 1,
-        const A_REQUIRED_ELSE_HELP = 1 << 2,
-        const GLOBAL_VERSION       = 1 << 3,
-        const VERSIONLESS_SC       = 1 << 4,
-        const UNIFIED_HELP         = 1 << 5,
-        const WAIT_ON_ERROR        = 1 << 6,
-        const SC_REQUIRED_ELSE_HELP= 1 << 7,
-        const NEEDS_LONG_HELP      = 1 << 8,
-        const NEEDS_LONG_VERSION   = 1 << 9,
-        const NEEDS_SC_HELP        = 1 << 10,
-        const DISABLE_VERSION      = 1 << 11,
-        const HIDDEN               = 1 << 12,
-        const TRAILING_VARARG      = 1 << 13,
-        const NO_BIN_NAME          = 1 << 14,
-        const ALLOW_UNK_SC         = 1 << 15,
-        const UTF8_STRICT          = 1 << 16,
-        const UTF8_NONE            = 1 << 17,
-        const LEADING_HYPHEN       = 1 << 18,
-        const NO_POS_VALUES        = 1 << 19,
-        const NEXT_LINE_HELP       = 1 << 20,
-        const DERIVE_DISP_ORDER    = 1 << 21,
-        const COLORED_HELP         = 1 << 22,
-        const COLOR_ALWAYS         = 1 << 23,
-        const COLOR_AUTO           = 1 << 24,
-        const COLOR_NEVER          = 1 << 25,
-        const DONT_DELIM_TRAIL     = 1 << 26,
-        const ALLOW_NEG_NUMS       = 1 << 27,
-        const LOW_INDEX_MUL_POS    = 1 << 28,
-        const DISABLE_HELP_SC      = 1 << 29,
-        const DONT_COLLAPSE_ARGS   = 1 << 30,
-        const ARGS_NEGATE_SCS      = 1 << 31,
-        const PROPAGATE_VALS_DOWN  = 1 << 32,
-        const ALLOW_MISSING_POS    = 1 << 33,
-        const TRAILING_VALUES      = 1 << 34,
-        const VALID_NEG_NUM_FOUND  = 1 << 35,
-        const PROPOGATED           = 1 << 36,
-        const VALID_ARG_FOUND      = 1 << 37,
-        const INFER_SUBCOMMANDS    = 1 << 38,
-        const CONTAINS_LAST        = 1 << 39,
+    struct Flags: u64 {
+        const SC_NEGATE_REQS       = 1 << 0;
+        const SC_REQUIRED          = 1 << 1;
+        const A_REQUIRED_ELSE_HELP = 1 << 2;
+        const GLOBAL_VERSION       = 1 << 3;
+        const VERSIONLESS_SC       = 1 << 4;
+        const UNIFIED_HELP         = 1 << 5;
+        const WAIT_ON_ERROR        = 1 << 6;
+        const SC_REQUIRED_ELSE_HELP= 1 << 7;
+        const NEEDS_LONG_HELP      = 1 << 8;
+        const NEEDS_LONG_VERSION   = 1 << 9;
+        const NEEDS_SC_HELP        = 1 << 10;
+        const DISABLE_VERSION      = 1 << 11;
+        const HIDDEN               = 1 << 12;
+        const TRAILING_VARARG      = 1 << 13;
+        const NO_BIN_NAME          = 1 << 14;
+        const ALLOW_UNK_SC         = 1 << 15;
+        const UTF8_STRICT          = 1 << 16;
+        const UTF8_NONE            = 1 << 17;
+        const LEADING_HYPHEN       = 1 << 18;
+        const NO_POS_VALUES        = 1 << 19;
+        const NEXT_LINE_HELP       = 1 << 20;
+        const DERIVE_DISP_ORDER    = 1 << 21;
+        const COLORED_HELP         = 1 << 22;
+        const COLOR_ALWAYS         = 1 << 23;
+        const COLOR_AUTO           = 1 << 24;
+        const COLOR_NEVER          = 1 << 25;
+        const DONT_DELIM_TRAIL     = 1 << 26;
+        const ALLOW_NEG_NUMS       = 1 << 27;
+        const LOW_INDEX_MUL_POS    = 1 << 28;
+        const DISABLE_HELP_SC      = 1 << 29;
+        const DONT_COLLAPSE_ARGS   = 1 << 30;
+        const ARGS_NEGATE_SCS      = 1 << 31;
+        const PROPAGATE_VALS_DOWN  = 1 << 32;
+        const ALLOW_MISSING_POS    = 1 << 33;
+        const TRAILING_VALUES      = 1 << 34;
+        const VALID_NEG_NUM_FOUND  = 1 << 35;
+        const PROPOGATED           = 1 << 36;
+        const VALID_ARG_FOUND      = 1 << 37;
+        const INFER_SUBCOMMANDS    = 1 << 38;
+        const CONTAINS_LAST        = 1 << 39;
     }
 }
 

src/args/settings.rs

@@ -3,23 +3,23 @@ use std::ascii::AsciiExt;
 use std::str::FromStr;
 
 bitflags! {
-    flags Flags: u16 {
-        const REQUIRED         = 1 << 0,
-        const MULTIPLE         = 1 << 1,
-        const EMPTY_VALS       = 1 << 2,
-        const GLOBAL           = 1 << 3,
-        const HIDDEN           = 1 << 4,
-        const TAKES_VAL        = 1 << 5,
-        const USE_DELIM        = 1 << 6,
-        const NEXT_LINE_HELP   = 1 << 7,
-        const R_UNLESS_ALL     = 1 << 8,
-        const REQ_DELIM        = 1 << 9,
-        const DELIM_NOT_SET    = 1 << 10,
-        const HIDE_POS_VALS    = 1 << 11,
-        const ALLOW_TAC_VALS   = 1 << 12,
-        const REQUIRE_EQUALS   = 1 << 13,
-        const LAST             = 1 << 14,
-        const HIDE_DEFAULT_VAL = 1 << 15,
+    struct Flags: u16 {
+        const REQUIRED         = 1 << 0;
+        const MULTIPLE         = 1 << 1;
+        const EMPTY_VALS       = 1 << 2;
+        const GLOBAL           = 1 << 3;
+        const HIDDEN           = 1 << 4;
+        const TAKES_VAL        = 1 << 5;
+        const USE_DELIM        = 1 << 6;
+        const NEXT_LINE_HELP   = 1 << 7;
+        const R_UNLESS_ALL     = 1 << 8;
+        const REQ_DELIM        = 1 << 9;
+        const DELIM_NOT_SET    = 1 << 10;
+        const HIDE_POS_VALS    = 1 << 11;
+        const ALLOW_TAC_VALS   = 1 << 12;
+        const REQUIRE_EQUALS   = 1 << 13;
+        const LAST             = 1 << 14;
+        const HIDE_DEFAULT_VAL = 1 << 15;
     }
 }