Skip to content

Commit

Permalink
Auto merge of #26319 - atouchet:cargo, r=jdm
Browse files Browse the repository at this point in the history 
Some Cargo.toml cleanups

<!-- Please describe your changes on the following line: -->
Some Cargo.toml cleanups. Adapted from #26024.

---
<!-- 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. -->
  • Loading branch information
@bors-servo
bors-servo committed Apr 25, 2020
2 parents e5a8316 + b5a3f01 commit bcdc555
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 73 deletions.
50 changes: 25 additions & 25 deletions components/constellation/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,40 +11,40 @@ name = "constellation"
path = "lib.rs"

[dependencies]
background_hang_monitor = { path = "../background_hang_monitor"}
background_hang_monitor = { path = "../background_hang_monitor" }
backtrace = "0.3"
bluetooth_traits = { path = "../bluetooth_traits" }
canvas_traits = {path = "../canvas_traits"}
compositing = {path = "../compositing"}
canvas_traits = { path = "../canvas_traits" }
compositing = { path = "../compositing" }
crossbeam-channel = "0.4"
debugger = {path = "../debugger"}
devtools_traits = {path = "../devtools_traits"}
euclid = "0.20"
debugger = { path = "../debugger" }
devtools_traits = { path = "../devtools_traits" }
embedder_traits = { path = "../embedder_traits" }
gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"}
euclid = "0.20"
gfx = { path = "../gfx" }
gfx_traits = { path = "../gfx_traits" }
http = "0.1"
ipc-channel = "0.14"
layout_traits = {path = "../layout_traits"}
keyboard-types = "0.4.3"
layout_traits = { path = "../layout_traits" }
log = "0.4"
media = {path = "../media"}
metrics = {path = "../metrics"}
msg = {path = "../msg"}
net = {path = "../net"}
net_traits = {path = "../net_traits"}
profile_traits = {path = "../profile_traits"}
script_traits = {path = "../script_traits"}
media = { path = "../media" }
metrics = { path = "../metrics" }
msg = { path = "../msg" }
net = { path = "../net" }
net_traits = { path = "../net_traits" }
profile_traits = { path = "../profile_traits" }
script_traits = { path = "../script_traits" }
serde = "1.0"
style_traits = {path = "../style_traits"}
servo_config = {path = "../config"}
servo_geometry = {path = "../geometry"}
servo_rand = {path = "../rand"}
servo_remutex = {path = "../remutex"}
servo_url = {path = "../url"}
webgpu = {path = "../webgpu"}
webrender_api = {git = "https://github.com/servo/webrender"}
webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]}
servo_config = { path = "../config" }
servo_geometry = { path = "../geometry" }
servo_rand = {path = "../rand" }
servo_remutex = { path = "../remutex" }
servo_url = { path = "../url" }
style_traits = { path = "../style_traits" }
webgpu = { path = "../webgpu" }
webrender_api = { git = "https://github.com/servo/webrender" }
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }

[target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies]
gaol = "0.2.1"
82 changes: 41 additions & 41 deletions components/script/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,25 @@ phf_shared = "0.8"
serde_json = "1.0"

[dependencies]
accountable-refcell = {version = "0.2.0", optional = true}
accountable-refcell = { version = "0.2.0", optional = true }
app_units = "0.7"
backtrace = {version = "0.3", optional = true}
backtrace = { version = "0.3", optional = true }
base64 = "0.10.1"
bincode = "1"
bitflags = "1.0"
bluetooth_traits = {path = "../bluetooth_traits"}
canvas_traits = {path = "../canvas_traits"}
bluetooth_traits = { path = "../bluetooth_traits" }
canvas_traits = { path = "../canvas_traits" }
caseless = "0.2"
content-security-policy = {version = "0.4.0", features = ["serde"]}
cookie = "0.11"
chrono = "0.4"
content-security-policy = { version = "0.4.0", features = ["serde"] }
cookie = "0.11"
crossbeam-channel = "0.4"
cssparser = "0.27"
deny_public_fields = {path = "../deny_public_fields"}
devtools_traits = {path = "../devtools_traits"}
dom_struct = {path = "../dom_struct"}
domobject_derive = {path = "../domobject_derive"}
embedder_traits = {path = "../embedder_traits"}
deny_public_fields = { path = "../deny_public_fields" }
devtools_traits = { path = "../devtools_traits" }
dom_struct = { path = "../dom_struct" }
domobject_derive = { path = "../domobject_derive" }
embedder_traits = { path = "../embedder_traits" }
encoding_rs = "0.8"
enum-iterator = "0.3"
euclid = "0.20"
Expand All @@ -62,61 +62,61 @@ image = "0.23"
indexmap = "1.0.2"
ipc-channel = "0.14"
itertools = "0.8"
jstraceable_derive = {path = "../jstraceable_derive"}
js = {package = "mozjs", git = "https://github.com/servo/rust-mozjs"}
js = { package = "mozjs", git = "https://github.com/servo/rust-mozjs" }
jstraceable_derive = { path = "../jstraceable_derive" }
keyboard-types = "0.4.4"
lazy_static = "1"
libc = "0.2"
log = "0.4"
malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = "0.1"
media = {path = "../media"}
metrics = {path = "../metrics"}
mitochondria = "1.1.2"
media = { path = "../media" }
metrics = { path = "../metrics" }
mime = "0.3.13"
mime_guess = "2.0.0-alpha.6"
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
mitochondria = "1.1.2"
msg = { path = "../msg" }
net_traits = { path = "../net_traits" }
num-traits = "0.2"
parking_lot = "0.9"
percent-encoding = "2.0"
phf = "0.8"
pixels = {path = "../pixels"}
profile_traits = {path = "../profile_traits"}
pixels = { path = "../pixels" }
profile_traits = { path = "../profile_traits" }
ref_filter_map = "1.0.1"
ref_slice = "1.0"
regex = "1.1"
script_layout_interface = {path = "../script_layout_interface"}
script_plugins = {path = "../script_plugins"}
script_traits = {path = "../script_traits"}
script_layout_interface = { path = "../script_layout_interface" }
script_plugins = { path = "../script_plugins" }
script_traits = { path = "../script_traits" }
selectors = { path = "../selectors" }
serde = {version = "1", features = ["derive"]}
serde = { version = "1", features = ["derive"] }
serde_bytes = "0.11"
servo_allocator = {path = "../allocator"}
servo_arc = {path = "../servo_arc"}
servo_atoms = {path = "../atoms"}
servo_config = {path = "../config"}
servo_geometry = {path = "../geometry" }
servo-media = {git = "https://github.com/servo/media"}
servo_rand = {path = "../rand"}
servo_url = {path = "../url"}
sparkle = "0.1"
servo_allocator = { path = "../allocator" }
servo_arc = { path = "../servo_arc" }
servo_atoms = { path = "../atoms" }
servo_config = { path = "../config" }
servo_geometry = { path = "../geometry" }
servo_rand = { path = "../rand" }
servo_url = { path = "../url" }
servo-media = { git = "https://github.com/servo/media" }
smallvec = { version = "0.6", features = ["std", "union"] }
style = {path = "../style", features = ["servo"]}
style_traits = {path = "../style_traits"}
sparkle = "0.1"
style = { path = "../style", features = ["servo"] }
style_traits = { path = "../style_traits" }
swapper = "0.1"
tendril = {version = "0.4.1", features = ["encoding_rs"]}
tendril = { version = "0.4.1", features = ["encoding_rs"] }
time = "0.1.12"
unicode-bidi = "0.3.4"
unicode-segmentation = "1.1.0"
url = "2.0"
utf-8 = "0.7"
uuid = {version = "0.8", features = ["v4", "serde"]}
xml5ever = "0.16"
uuid = { version = "0.8", features = ["v4", "serde"] }
webdriver = "0.40"
webgpu = {path = "../webgpu"}
webrender_api = {git = "https://github.com/servo/webrender"}
webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]}
webgpu = { path = "../webgpu" }
webrender_api = { git = "https://github.com/servo/webrender" }
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
xml5ever = "0.16"

[target.'cfg(not(target_os = "ios"))'.dependencies]
mozangle = "0.2"
6 changes: 3 additions & 3 deletions ports/glutin/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ getopts = "0.2.11"
gleam = "0.11"
keyboard-types = "0.4.3"
lazy_static = "1"
libservo = {path = "../../components/servo"}
libc = "0.2"
libservo = { path = "../../components/servo" }
log = "0.4"
servo-media = {git = "https://github.com/servo/media"}
servo-media = { git = "https://github.com/servo/media" }
shellwords = "1.0.0"
surfman = { version = "0.2", features = ["sm-winit", "sm-x11"] }
tinyfiledialogs = "3.0"
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "glwindow", "headless"] }
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
winit = "0.19"

[target.'cfg(any(target_os = "linux", target_os = "windows"))'.dependencies]
Expand Down
8 changes: 4 additions & 4 deletions ports/libsimpleservo/capi/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ test = false
bench = false

[dependencies]
simpleservo = { path = "../api" }
log = "0.4"
lazy_static = "1"
env_logger = "0.7"
backtrace = "0.3"
env_logger = "0.7"
lazy_static = "1"
log = "0.4"
simpleservo = { path = "../api" }
surfman = "0.2"

[target.'cfg(target_os = "windows")'.dependencies]
Expand Down

0 comments on commit bcdc555

Please sign in to comment.