Skip to content

Commit 8db2832

Browse files
lennartkloocklennartkloock
committed
fix: rebase chaos
1 parent 502ed6c commit 8db2832

37 files changed

+187
-118
lines changed

‎Cargo.lock‎

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

‎crates/aac/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ bytes = "1.5"
2222
document-features = { optional = true, version = "0.2" }
2323
num-derive = "0.4"
2424
num-traits = "0.2"
25-
scuffle-bytes-util = { path = "../bytes-util", version = "0.1.3" }
26-
scuffle-changelog = { optional = true, path = "../changelog", version = "0.1.0" }
25+
scuffle-bytes-util = { path = "../bytes-util", version = "0.1.5" }
26+
scuffle-changelog = { optional = true, path = "../changelog", version = "0.1.1" }
2727

2828
[package.metadata.docs.rs]
2929
all-features = true

‎crates/amf0/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ bytestring = "1.4.0"
1919
document-features = { optional = true, version = "0.2" }
2020
num-derive = "0.4"
2121
num-traits = "0.2"
22-
scuffle-bytes-util = { path = "../bytes-util", version = "0.1.3" }
23-
scuffle-changelog = { optional = true, path = "../changelog", version = "0.1.0" }
22+
scuffle-bytes-util = { path = "../bytes-util", version = "0.1.5" }
23+
scuffle-changelog = { optional = true, path = "../changelog", version = "0.1.1" }
2424
serde = { optional = true, version = "1" }
2525
thiserror = "2.0"
2626

‎crates/av1/BUILD.bazel‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@ scuffle_package(
99
":Cargo.toml",
1010
],
1111
crate_name = "scuffle-av1",
12-
proc_macro_deps = ["//crates/changelog"],
12+
proc_macro_deps = [
13+
"//crates/changelog",
14+
"//crates/isobmff/derive",
15+
],
1316
test = scuffle_test(
1417
insta = True,
1518
),
16-
deps = ["//crates/bytes-util"],
19+
deps = [
20+
"//crates/bytes-util",
21+
"//crates/isobmff",
22+
],
1723
)

‎crates/av1/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ bytes = "1.5"
2525
document-features = { optional = true, version = "0.2" }
2626
isobmff = { path = "../isobmff", version = "0.1.0", optional = true }
2727
isobmff-derive = { path = "../isobmff/derive", version = "0.1.0", optional = true }
28-
scuffle-bytes-util = { path = "../bytes-util", version = "0.1.4" }
29-
scuffle-changelog = { optional = true, path = "../changelog", version = "0.1.0" }
28+
scuffle-bytes-util = { path = "../bytes-util", version = "0.1.5" }
29+
scuffle-changelog = { optional = true, path = "../changelog", version = "0.1.1" }
3030

3131
[dev-dependencies]
3232
insta = "1.42"

‎crates/bytes-util/Cargo.toml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "scuffle-bytes-util"
3-
version = "0.1.4"
3+
version = "0.1.5"
44
authors = ["Scuffle <[email protected]>"]
55
documentation = "https://docs.rs/scuffle-bytes-util"
66
edition = "2024"
@@ -14,10 +14,11 @@ description = "A utility crate for working with bytes."
1414
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage_nightly)'] }
1515

1616
[dependencies]
17+
byteorder = "1.5"
1718
bytes = "1.5"
1819
bytestring = "1.4.0"
1920
document-features = { optional = true, version = "0.2" }
20-
scuffle-changelog = { optional = true, path = "../changelog", version = "0.1.0" }
21+
scuffle-changelog = { optional = true, path = "../changelog", version = "0.1.1" }
2122
serde = { optional = true, version = "1.0.129" }
2223

2324
[features]

‎crates/bytes-util/src/zero_copy/mod.rs‎ renamed to ‎crates/bytes-util/src/zero_copy.rs‎

File renamed without changes.

‎crates/expgolomb/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "scuffle-expgolomb"
3-
version = "0.1.4"
3+
version = "0.1.5"
44
authors = ["Scuffle <[email protected]>"]
55
documentation = "https://docs.rs/scuffle-expgolomb"
66
edition = "2024"
@@ -19,8 +19,8 @@ docs = ["dep:scuffle-changelog", "dep:document-features"]
1919

2020
[dependencies]
2121
document-features = { optional = true, version = "0.2" }
22-
scuffle-bytes-util = { path = "../bytes-util", version = "0.1.3" }
23-
scuffle-changelog = { optional = true, path = "../changelog", version = "0.1.0" }
22+
scuffle-bytes-util = { path = "../bytes-util", version = "0.1.5" }
23+
scuffle-changelog = { optional = true, path = "../changelog", version = "0.1.1" }
2424

2525
[dev-dependencies]
2626
bytes = "1.5"

‎crates/ffmpeg/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ scuffle_package(
3030
"ASSETS_DIR": "$(rootpath @scuffle_assets//:mp4)",
3131
},
3232
insta = True,
33-
deps = ["//crates/mp4"],
33+
deps = ["//crates/mp4", "//crates/isobmff", "//crates/bytes-util"],
3434
),
3535
deps = ["//crates/nutype-enum"],
3636
)

‎crates/ffmpeg/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ bytes = { optional = true, version = "1" }
2121
crossbeam-channel = { optional = true, version = "0.5.13" }
2222
document-features = { optional = true, version = "0.2" }
2323
libc = "0.2"
24-
nutype-enum = { path = "../nutype-enum", version = "0.1.4" }
24+
nutype-enum = { path = "../nutype-enum", version = "0.1.5" }
2525
rusty_ffmpeg = "0.16.4"
26-
scuffle-changelog = { optional = true, path = "../changelog", version = "0.1.0" }
26+
scuffle-changelog = { optional = true, path = "../changelog", version = "0.1.1" }
2727
thiserror = "2.0"
2828
tokio = { features = ["sync"], optional = true, version = "1" }
2929
tracing = { optional = true, version = "0.1" }
@@ -34,7 +34,7 @@ bytes = "1"
3434
insta = { features = ["filters"], version = "1.42" }
3535
isobmff = { path = "../isobmff", version = "0.1.0" }
3636
rand = "0.9"
37-
scuffle-bytes-util = { path = "../bytes-util", version = "0.1.4" }
37+
scuffle-bytes-util = { path = "../bytes-util", version = "0.1.5" }
3838
sha2 = "0.10"
3939
tempfile = "3.15"
4040
tracing-subscriber = "0.3"

0 commit comments

Comments
 (0)