Update clap & hevc_parser

Cargo.toml

@@ -9,18 +9,18 @@ build = "build.rs"
 
 [dependencies]
 bitvec_helpers = "2.0.0"
-hevc_parser = { version = "0.5.0", features = ["hevc_io"] }
+hevc_parser = { version = "0.5.1", features = ["hevc_io"] }
 dolby_vision = { path = "dolby_vision", "features" = ["xml", "serde_feature"] }
 madvr_parse = "1.0.1"
 
 anyhow = "1.0.65"
-clap = { version = "3.2.22", features = ["derive", "wrap_help", "deprecated"] }
+clap = { version = "4.0.4", features = ["derive", "wrap_help", "deprecated"] }
 indicatif = "0.17.1"
 regex = "1.6.0"
 bitvec = "1.0.1"
-serde = { version = "1.0.144", features = ["derive"] }
+serde = { version = "1.0.145", features = ["derive"] }
 serde_json = { version = "1.0.85", features = ["preserve_order"] }
-itertools = "0.10.4"
+itertools = "0.10.5"
 
 [dev-dependencies]
 assert_cmd = "2.0.4"

dolby_vision/Cargo.toml

@@ -13,11 +13,11 @@ bitvec_helpers = "2.0.0"
 anyhow = "1.0.65"
 bitvec = "1.0.1"
 crc = "3.0.0"
-serde = { version = "1.0.144", features = ["derive"], "optional" = true }
+serde = { version = "1.0.145", features = ["derive"], "optional" = true }
 serde_json = { version = "1.0.85", features = ["preserve_order"], "optional" = true }
 roxmltree = { version = "0.15.0", optional = true }
 
-libc = { version = "0.2.132", optional = true }
+libc = { version = "0.2.134", optional = true }
 
 [features]
 xml = ["roxmltree"]

src/commands/convert.rs

@@ -3,8 +3,8 @@ use std::path::PathBuf;
 
 #[derive(Args, Debug)]
 pub struct ConvertArgs {
-    #[clap(
-        name = "input",
+    #[arg(
+        id = "input",
         help = "Sets the input HEVC file to use, or piped with -",
         long,
         short = 'i',
@@ -14,23 +14,23 @@ pub struct ConvertArgs {
     )]
     pub input: Option<PathBuf>,
 
-    #[clap(
-        name = "input_pos",
+    #[arg(
+        id = "input_pos",
         help = "Sets the input HEVC file to use, or piped with - (positional)",
         conflicts_with = "input",
         required_unless_present = "input",
         value_hint = ValueHint::FilePath
     )]
     pub input_pos: Option<PathBuf>,
 
-    #[clap(
+    #[arg(
         long,
         short = 'o',
         help = "Converted single layer output file location",
         value_hint = ValueHint::FilePath
     )]
     pub output: Option<PathBuf>,
 
-    #[clap(short = 'd', long, help = "Discard the EL stream")]
+    #[arg(short = 'd', long, help = "Discard the EL stream")]
     pub discard: bool,
 }

src/commands/demux.rs

@@ -3,8 +3,8 @@ use std::path::PathBuf;
 
 #[derive(Args, Debug)]
 pub struct DemuxArgs {
-    #[clap(
-        name = "input",
+    #[arg(
+        id = "input",
         help = "Sets the input HEVC file to use, or piped with -",
         long,
         short = 'i',
@@ -14,31 +14,31 @@ pub struct DemuxArgs {
     )]
     pub input: Option<PathBuf>,
 
-    #[clap(
-        name = "input_pos",
+    #[arg(
+        id = "input_pos",
         help = "Sets the input HEVC file to use, or piped with - (positional)",
         conflicts_with = "input",
         required_unless_present = "input",
         value_hint = ValueHint::FilePath
     )]
     pub input_pos: Option<PathBuf>,
 
-    #[clap(
+    #[arg(
         long,
         short = 'b',
         help = "BL output file location",
         value_hint = ValueHint::FilePath
     )]
     pub bl_out: Option<PathBuf>,
 
-    #[clap(
+    #[arg(
         long,
         short = 'e',
         help = "EL output file location",
         value_hint = ValueHint::FilePath
     )]
     pub el_out: Option<PathBuf>,
 
-    #[clap(long, help = "Output the EL file only")]
+    #[arg(long, help = "Output the EL file only")]
     pub el_only: bool,
 }

src/commands/editor.rs

@@ -3,8 +3,8 @@ use std::path::PathBuf;
 
 #[derive(Args, Debug)]
 pub struct EditorArgs {
-    #[clap(
-        name = "input",
+    #[arg(
+        id = "input",
         help = "Sets the input RPU file to use",
         long,
         short = 'i',
@@ -14,25 +14,25 @@ pub struct EditorArgs {
     )]
     pub input: Option<PathBuf>,
 
-    #[clap(
-        name = "input_pos",
+    #[arg(
+        id = "input_pos",
         help = "Sets the input RPU file to use (positional)",
         conflicts_with = "input",
         required_unless_present = "input",
         value_hint = ValueHint::FilePath
     )]
     pub input_pos: Option<PathBuf>,
 
-    #[clap(
-        name = "json",
+    #[arg(
+        id = "json",
         long,
         short = 'j',
         help = "Sets the edit JSON file to use",
         value_hint = ValueHint::FilePath
     )]
     pub json_file: PathBuf,
 
-    #[clap(
+    #[arg(
         long,
         short = 'o',
         help = "Modified RPU output file location",