Bug 1847139 - Use a versioned dependency on malloc_size_of_derive for standalone webrender. r=gfx-reviewers,jrmuizel

Differential Revision: https://phabricator.services.mozilla.com/D185384

Cargo.toml

@@ -194,6 +194,9 @@ minidump-writer = { git = "https://github.com/rust-minidump/minidump-writer.git"
 minidump-common = { git = "https://github.com/rust-minidump/rust-minidump", rev = "87a29fba5e19cfae5ebf73a57ba31504a3872545" }
 # warp 0.3.3 + https://github.com/seanmonstar/warp/pull/1007
 warp = { git = "https://github.com/glandium/warp", rev = "4af45fae95bc98b0eba1ef0db17e1dac471bb23d" }
+# Allow webrender to have a versioned dependency on the older crate on crates.io
+# in order to build standalone.
+malloc_size_of_derive = { path = "xpcom/rust/malloc_size_of_derive" }
 
 # application-services overrides to make updating them all simpler.
 interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "25972c388a4cf3a6d8256504f3a09b711db2fc6a" }

gfx/wr/Cargo.lock

@@ -1565,11 +1565,13 @@ dependencies = [
 
 [[package]]
 name = "malloc_size_of_derive"
-version = "0.1.3"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "632647502a8bfa82458c07134791fffa7a719f00427d1afd79c3cb6d4960a982"
 dependencies = [
  "proc-macro2",
- "syn 2.0.25",
- "synstructure",
+ "syn 1.0.91",
+ "synstructure 0.12.6",
 ]
 
 [[package]]
@@ -1979,7 +1981,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.25",
- "synstructure",
+ "synstructure 0.13.0",
  "unicode-xid",
 ]
 
@@ -2548,6 +2550,18 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.91",
+ "unicode-xid",
+]
+
 [[package]]
 name = "synstructure"
 version = "0.13.0"

gfx/wr/webrender/Cargo.toml

@@ -35,7 +35,7 @@ fxhash = "0.2.1"
 gleam = "0.15.0"
 lazy_static = "1"
 log = "0.4"
-malloc_size_of_derive = { path = "../../../xpcom/rust/malloc_size_of_derive" }
+malloc_size_of_derive = "0.1"
 num-traits = "0.2"
 plane-split = "0.18"
 png = { optional = true, version = "0.16" }

gfx/wr/webrender_api/Cargo.toml

@@ -18,7 +18,7 @@ app_units = "0.7.3"
 bitflags = "1.2"
 byteorder = "1.2.1"
 euclid = { version = "0.22.6", features = ["serde"] }
-malloc_size_of_derive = { path = "../../../xpcom/rust/malloc_size_of_derive" }
+malloc_size_of_derive = "0.1"
 serde = { version = "1.0", features = ["rc"] }
 serde_derive = "1.0"
 serde_bytes = "0.11"

gfx/wr/wr_glyph_rasterizer/Cargo.toml

@@ -18,7 +18,7 @@ gecko = ["firefox-on-glean", "glean"]
 api = { version = "0.62.0", path = "../webrender_api", package = "webrender_api" }
 euclid = { version = "0.22.0", features = ["serde"] }
 malloc_size_of = { version = "0.0.2", path = "../wr_malloc_size_of", package = "wr_malloc_size_of" }
-malloc_size_of_derive = { path = "../../../xpcom/rust/malloc_size_of_derive" }
+malloc_size_of_derive = "0.1"
 rayon = "1"
 smallvec = "1"
 tracy-rs = "0.1.2"