Skip to content

Commit

Permalink
Move malloc_size_of_derive back into the Servo repo
Browse files Browse the repository at this point in the history
The 'MallocSizeOf' trait is not available on crates.io, so the derive shouldn't be either.  Move this derive back into the Servo repository.

See issue servo#24419.
  • Loading branch information
twilco committed Oct 12, 2019
1 parent 0b5aaef commit 634e6d2
Show file tree
Hide file tree
Showing 21 changed files with 408 additions and 34 deletions.
45 changes: 27 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion components/canvas_traits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ euclid = "0.20"
ipc-channel = "0.12"
lazy_static = "1"
malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = "0.1"
malloc_size_of_derive = { path = "../malloc_size_of_derive" }
pixels = {path = "../pixels"}
serde = "1.0"
serde_bytes = "0.10"
Expand Down
2 changes: 1 addition & 1 deletion components/devtools_traits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ bitflags = "1.0"
http = "0.1"
ipc-channel = "0.12"
malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = "0.1"
malloc_size_of_derive = { path = "../malloc_size_of_derive" }
msg = {path = "../msg"}
serde = "1.0"
servo_url = {path = "../url"}
Expand Down
2 changes: 1 addition & 1 deletion components/geometry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ path = "lib.rs"
app_units = "0.7"
euclid = "0.20"
malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = "0.1"
malloc_size_of_derive = { path = "../malloc_size_of_derive" }
webrender_api = { git = "https://github.com/servo/webrender" }
2 changes: 1 addition & 1 deletion components/gfx_traits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ path = "lib.rs"

[dependencies]
malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = "0.1"
malloc_size_of_derive = { path = "../malloc_size_of_derive" }
range = {path = "../range"}
serde = "1.0"
16 changes: 16 additions & 0 deletions components/malloc_size_of_derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[package]
name = "malloc_size_of_derive"
version = "0.1.0"
authors = ["The Servo Project Developers"]
license = "MIT/Apache-2.0"
description = "Crate for Firefox memory reporting, not intended for external use"
publish = false

[lib]
path = "lib.rs"
proc-macro = true

[dependencies]
proc-macro2 = "0.4"
syn = { version = "0.15", features = ["full"] }
synstructure = "0.10"

0 comments on commit 634e6d2

Please sign in to comment.