Skip to content

Commit 762336f

Browse files
Bug 1956123 - build(webrender): allow ron 0.9.0 in dep. range r=gfx-reviewers,nical
Our currently vendored copy of WGPU is not source-compatible with `ron` 0.9.0 (see [wgpu#7439](gfx-rs/wgpu#7439)), but WGPU upstream would like to upgrade to it. WebRender, however, //is// source-compatible. Yay! This change allows WGPU—the only other consumer of `ron` in `mozilla-central` besides `webrender`—to upgrade freely later. Once said upgrade is landed, we can narrow the dependency range to 0.9.0 (see D243204). Differential Revision: https://phabricator.services.mozilla.com/D243204
1 parent 805ff34 commit 762336f

File tree

3 files changed

+24
-22
lines changed

3 files changed

+24
-22
lines changed

gfx/wr/Cargo.lock

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

gfx/wr/webrender/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ num-traits = "0.2"
4040
plane-split = "0.18"
4141
png = { optional = true, version = "0.16" }
4242
rayon = "1"
43-
ron = { optional = true, version = "0.8" }
43+
ron = { optional = true, version = ">=0.8, <0.10.0" }
4444
serde = { optional = true, version = "1.0", features = ["serde_derive"] }
4545
smallvec = "1"
4646
time = "0.1"

gfx/wr/wrench/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ crate-type = ["lib", "cdylib"]
1212
path = "src/main.rs"
1313

1414
[dependencies]
15-
base64 = "0.13"
15+
base64 = "0.22.1"
1616
env_logger = { version = "0.10", optional = true, default-features = false }
1717
gleam = "0.15"
1818
glutin = "0.28"

0 commit comments

Comments
 (0)