Skip to content

Commit a07ed34

Browse files
quietvoidquietvoid
committed
Update dependencies
1 parent 2884d24 commit a07ed34

9 files changed

Lines changed: 280 additions & 331 deletions

File tree

‎Cargo.lock‎

Lines changed: 238 additions & 288 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ license = "MIT"
88

99
[dependencies]
1010
hdr10plus = { path = "./hdr10plus", features = ["hevc", "json"] }
11-
bitvec_helpers = { version = "4.0.0", default-features = false, features = ["bitstream-io"] }
12-
hevc_parser = { version = "0.6.9", features = ["hevc_io"] }
11+
bitvec_helpers = { version = "4.0.1", default-features = false, features = ["bitstream-io"] }
12+
hevc_parser = { version = "0.6.10", features = ["hevc_io"] }
1313

14-
clap = { version = "4.5.41", features = ["derive", "wrap_help", "deprecated"] }
15-
serde_json = { version = "1.0.140", features = ["preserve_order"] }
16-
indicatif = "0.18.0"
17-
anyhow = "1.0.98"
18-
thiserror = "2.0.12"
14+
clap = { version = "4.5.53", features = ["derive", "wrap_help", "deprecated"] }
15+
serde_json = { version = "1.0.148", features = ["preserve_order"] }
16+
indicatif = "0.18.3"
17+
anyhow = "1.0.100"
18+
thiserror = "2.0.17"
1919
plotters = { version = "0.3.7", default-features = false, features = ["bitmap_backend", "bitmap_encoder", "all_series"] }
20-
serde = { version = "1.0.219", features = ["derive"] }
20+
serde = { version = "1.0.228", features = ["derive"] }
2121

2222
[dev-dependencies]
23-
assert_cmd = "2.0.17"
23+
assert_cmd = "2.1.1"
2424
assert_fs = "1.1.3"
2525
predicates = "3.1.3"
2626

‎hdr10plus/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ description = "HDR10+ metadata parsing and writing"
99
repository = "https://github.com/quietvoid/hdr10plus_tool/tree/master/hdr10plus"
1010

1111
[dependencies]
12-
bitvec_helpers = { version = "4.0.0", default-features = false, features = ["bitstream-io"] }
13-
hevc_parser = { version = "0.6.9", optional = true }
12+
bitvec_helpers = { version = "4.0.1", default-features = false, features = ["bitstream-io"] }
13+
hevc_parser = { version = "0.6.10", optional = true }
1414

15-
anyhow = "1.0.98"
16-
serde = { version = "1.0.219", features = ["derive"], optional = true }
17-
serde_json = { version = "1.0.140", features = ["preserve_order"], optional = true }
15+
anyhow = "1.0.100"
16+
serde = { version = "1.0.228", features = ["derive"], optional = true }
17+
serde_json = { version = "1.0.148", features = ["preserve_order"], optional = true }
1818

1919
libc = { version = "0.2", optional = true }
2020

‎tests/hevc/extract.rs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::path::Path;
22

33
use anyhow::Result;
4-
use assert_cmd::Command;
4+
use assert_cmd::cargo;
55
use assert_fs::prelude::*;
66
use predicates::prelude::*;
77

@@ -10,11 +10,10 @@ use hdr10plus::{
1010
metadata_json::MetadataJsonRoot,
1111
};
1212

13-
const TOOL_NAME: &str = env!("CARGO_PKG_NAME");
1413
const SUBCOMMAND: &str = "extract";
1514

1615
fn assert_cmd_output(input: &Path, output: &Path, validate: bool) -> Result<()> {
17-
let mut cmd = Command::cargo_bin(TOOL_NAME)?;
16+
let mut cmd = cargo::cargo_bin_cmd!();
1817

1918
if !validate {
2019
cmd.arg("--skip-validation");
@@ -69,7 +68,7 @@ fn assert_scene_info(
6968

7069
#[test]
7170
fn help() -> Result<()> {
72-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
71+
let mut cmd = cargo::cargo_bin_cmd!();
7372
let assert = cmd.arg(SUBCOMMAND).arg("--help").assert();
7473

7574
assert
@@ -1945,7 +1944,7 @@ fn dhdr10_opt_gaps() -> Result<()> {
19451944

19461945
#[test]
19471946
fn pts_injected() -> Result<()> {
1948-
let mut cmd = Command::cargo_bin(TOOL_NAME)?;
1947+
let mut cmd = cargo::cargo_bin_cmd!();
19491948

19501949
let input_file = Path::new("assets/hevc_tests/pts_injected.hevc");
19511950
let temp = assert_fs::TempDir::new()?;
@@ -1970,7 +1969,7 @@ fn pts_injected() -> Result<()> {
19701969

19711970
#[test]
19721971
fn dts_injected() -> Result<()> {
1973-
let mut cmd = Command::cargo_bin(TOOL_NAME)?;
1972+
let mut cmd = cargo::cargo_bin_cmd!();
19741973

19751974
let input_file = Path::new("assets/hevc_tests/dts_injected.hevc");
19761975
let temp = assert_fs::TempDir::new()?;

‎tests/hevc/inject.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
use std::path::Path;
22

33
use anyhow::Result;
4-
use assert_cmd::Command;
4+
use assert_cmd::cargo;
55
use assert_fs::prelude::*;
66
use predicates::prelude::*;
77

88
const SUBCOMMAND: &str = "inject";
99

1010
#[test]
1111
fn help() -> Result<()> {
12-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
12+
let mut cmd = cargo::cargo_bin_cmd!();
1313
let assert = cmd.arg(SUBCOMMAND).arg("--help").assert();
1414

1515
assert
@@ -23,7 +23,7 @@ fn help() -> Result<()> {
2323

2424
#[test]
2525
fn inject() -> Result<()> {
26-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
26+
let mut cmd = cargo::cargo_bin_cmd!();
2727
let temp = assert_fs::TempDir::new().unwrap();
2828

2929
let input_file = Path::new("assets/hevc_tests/regular_bl_start_code_4.hevc");
@@ -52,7 +52,7 @@ fn inject() -> Result<()> {
5252

5353
#[test]
5454
fn and_extract() -> Result<()> {
55-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
55+
let mut cmd = cargo::cargo_bin_cmd!();
5656
let temp = assert_fs::TempDir::new().unwrap();
5757

5858
let input_file = Path::new("assets/hevc_tests/regular_bl_start_code_4.hevc");
@@ -78,7 +78,7 @@ fn and_extract() -> Result<()> {
7878

7979
let output_json = temp.child("metadata.json");
8080

81-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
81+
let mut cmd = cargo::cargo_bin_cmd!();
8282

8383
let assert = cmd
8484
.arg("extract")
@@ -98,7 +98,7 @@ fn and_extract() -> Result<()> {
9898

9999
#[test]
100100
fn inject_replace() -> Result<()> {
101-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
101+
let mut cmd = cargo::cargo_bin_cmd!();
102102
let temp = assert_fs::TempDir::new().unwrap();
103103

104104
let input_file = Path::new("assets/hevc_tests/single-frame.hevc");
@@ -124,7 +124,7 @@ fn inject_replace() -> Result<()> {
124124

125125
let output_json = temp.child("metadata.json");
126126

127-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
127+
let mut cmd = cargo::cargo_bin_cmd!();
128128

129129
let assert = cmd
130130
.arg("extract")
@@ -146,7 +146,7 @@ fn inject_replace() -> Result<()> {
146146
// And places it back outside as an independent SEI NALU
147147
#[test]
148148
fn inject_replace_multimsg() -> Result<()> {
149-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
149+
let mut cmd = cargo::cargo_bin_cmd!();
150150
let temp = assert_fs::TempDir::new().unwrap();
151151

152152
let input_file = Path::new("assets/hevc_tests/multimsg-sei.hevc");
@@ -172,7 +172,7 @@ fn inject_replace_multimsg() -> Result<()> {
172172

173173
let output_json = temp.child("metadata.json");
174174

175-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
175+
let mut cmd = cargo::cargo_bin_cmd!();
176176

177177
let assert = cmd
178178
.arg("extract")

‎tests/hevc/remove.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
use std::path::Path;
22

33
use anyhow::Result;
4-
use assert_cmd::Command;
4+
use assert_cmd::cargo;
55
use assert_fs::prelude::*;
66
use predicates::prelude::*;
77

88
const SUBCOMMAND: &str = "remove";
99

1010
#[test]
1111
fn help() -> Result<()> {
12-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
12+
let mut cmd = cargo::cargo_bin_cmd!();
1313
let assert = cmd.arg(SUBCOMMAND).arg("--help").assert();
1414

1515
assert
@@ -23,7 +23,7 @@ fn help() -> Result<()> {
2323

2424
#[test]
2525
fn remove() -> Result<()> {
26-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
26+
let mut cmd = cargo::cargo_bin_cmd!();
2727
let temp = assert_fs::TempDir::new().unwrap();
2828

2929
let input_file = Path::new("assets/hevc_tests/regular.hevc");
@@ -49,7 +49,7 @@ fn remove() -> Result<()> {
4949

5050
#[test]
5151
fn sei_double_3byte_case() -> Result<()> {
52-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
52+
let mut cmd = cargo::cargo_bin_cmd!();
5353
let temp = assert_fs::TempDir::new().unwrap();
5454

5555
let input_file = Path::new("assets/hevc_tests/sei-double-3byte-case.hevc");

‎tests/metadata/editor.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::{fs::File, path::Path};
22

33
use anyhow::Result;
4-
use assert_cmd::Command;
4+
use assert_cmd::cargo;
55
use assert_fs::prelude::*;
66
use hdr10plus::metadata_json::MetadataJsonRoot;
77
use predicates::prelude::*;
@@ -10,7 +10,7 @@ const SUBCOMMAND: &str = "editor";
1010

1111
#[test]
1212
fn help() -> Result<()> {
13-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
13+
let mut cmd = cargo::cargo_bin_cmd!();
1414
let assert = cmd.arg(SUBCOMMAND).arg("--help").assert();
1515

1616
assert
@@ -24,7 +24,7 @@ fn help() -> Result<()> {
2424

2525
#[test]
2626
fn duplicate() -> Result<()> {
27-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
27+
let mut cmd = cargo::cargo_bin_cmd!();
2828
let temp = assert_fs::TempDir::new().unwrap();
2929

3030
let input_json = Path::new("assets/hevc_tests/regular_metadata.json");
@@ -73,7 +73,7 @@ fn duplicate() -> Result<()> {
7373

7474
#[test]
7575
fn remove() -> Result<()> {
76-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
76+
let mut cmd = cargo::cargo_bin_cmd!();
7777
let temp = assert_fs::TempDir::new().unwrap();
7878

7979
let input_json = Path::new("assets/hevc_tests/regular_metadata.json");

‎tests/metadata/plot.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
use std::path::Path;
22

33
use anyhow::Result;
4-
use assert_cmd::Command;
4+
use assert_cmd::cargo;
55
use assert_fs::prelude::*;
66
use predicates::prelude::*;
77

88
const SUBCOMMAND: &str = "plot";
99

1010
#[test]
1111
fn help() -> Result<()> {
12-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
12+
let mut cmd = cargo::cargo_bin_cmd!();
1313
let assert = cmd.arg(SUBCOMMAND).arg("--help").assert();
1414

1515
assert
@@ -23,7 +23,7 @@ fn help() -> Result<()> {
2323

2424
#[test]
2525
fn plot_hdr10plus() -> Result<()> {
26-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
26+
let mut cmd = cargo::cargo_bin_cmd!();
2727
let temp = assert_fs::TempDir::new().unwrap();
2828

2929
let input_json = Path::new("assets/hevc_tests/regular_metadata.json");

‎tests/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use anyhow::Result;
2-
use assert_cmd::Command;
2+
use assert_cmd::cargo;
33
use predicates::prelude::*;
44

55
mod hevc;
66
mod metadata;
77

88
#[test]
99
fn help() -> Result<()> {
10-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
10+
let mut cmd = cargo::cargo_bin_cmd!();
1111
let assert = cmd.arg("--help").assert();
1212

1313
assert
@@ -21,7 +21,7 @@ fn help() -> Result<()> {
2121

2222
#[test]
2323
fn version() -> Result<()> {
24-
let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
24+
let mut cmd = cargo::cargo_bin_cmd!();
2525
let assert = cmd.arg("--version").assert();
2626

2727
assert.success().stderr(predicate::str::is_empty());

0 commit comments

Comments
 (0)