Auto merge of #26643 - atouchet:comp, r=jdm

More Cargo.toml updates

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because ___

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
bors-servo 2020-05-26 02:29:34 -04:00 committed by GitHub
commit 7170a69695
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 21 deletions

View file

@ -10,6 +10,8 @@ path = "lib.rs"
[features]
servo = [
"accountable-refcell",
"content-security-policy",
"crossbeam-channel",
"hyper",
"hyper_serde",
@ -19,11 +21,9 @@ servo = [
"string_cache",
"time",
"url",
"uuid",
"webrender_api",
"xml5ever",
"content-security-policy",
"uuid",
"accountable-refcell",
]
[dependencies]
@ -47,7 +47,7 @@ string_cache = { version = "0.8", optional = true }
thin-slice = "0.1.0"
time = { version = "0.1.17", optional = true }
url = { version = "2.0", optional = true }
uuid = { version = "0.8", features = ["v4"], optional = true }
void = "1.0.2"
webrender_api = { git = "https://github.com/servo/webrender", optional = true }
xml5ever = { version = "0.16", optional = true }
void = "1.0.2"
uuid = {version = "0.8", features = ["v4"], optional = true}

View file

@ -17,7 +17,7 @@ ipc-channel = "0.14"
lazy_static = "1"
log = "0.4"
serde = "1.0"
servo_config = {path = "../config"}
servo-media = { git = "https://github.com/servo/media" }
servo_config = { path = "../config" }
webrender_api = { git = "https://github.com/servo/webrender" }
webrender_traits = { path = "../webrender_traits" }

View file

@ -13,8 +13,8 @@ test = false
doctest = false
[dependencies]
lazy_static = "1"
ipc-channel = "0.14"
lazy_static = "1"
malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = "0.1"
parking_lot = "0.9"