Skip to content

Commit

Permalink
Some Cargo.toml cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
atouchet committed May 14, 2020
1 parent 6c506ba commit ede1555
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 40 deletions.
4 changes: 2 additions & 2 deletions components/background_hang_monitor/Cargo.toml
Expand Up @@ -14,12 +14,12 @@ doctest = false

[dependencies]
backtrace = "0.3"
crossbeam-channel = "0.4"
ipc-channel = "0.14"
libc = "0.2"
log = "0.4"
msg = {path = "../msg"}
msg = { path = "../msg" }
serde_json = "1.0"
crossbeam-channel = "0.4"

[dev-dependencies]
lazy_static = "1.0"
Expand Down
12 changes: 6 additions & 6 deletions components/bluetooth/Cargo.toml
Expand Up @@ -12,14 +12,14 @@ path = "lib.rs"

[dependencies]
bitflags = "1.0"
bluetooth_traits = {path = "../bluetooth_traits"}
device = {git = "https://github.com/servo/devices", features = ["bluetooth-test"]}
embedder_traits = {path = "../embedder_traits"}
bluetooth_traits = { path = "../bluetooth_traits" }
device = { git = "https://github.com/servo/devices", features = ["bluetooth-test"] }
embedder_traits = { path = "../embedder_traits" }
ipc-channel = "0.14"
log = "0.4"
servo_config = {path = "../config"}
servo_rand = {path = "../rand"}
uuid = {version = "0.8", features = ["v4"]}
servo_config = { path = "../config" }
servo_rand = { path = "../rand" }
uuid = { version = "0.8", features = ["v4"] }

[features]
native-bluetooth = ["device/bluetooth"]
2 changes: 1 addition & 1 deletion components/bluetooth_traits/Cargo.toml
Expand Up @@ -11,7 +11,7 @@ name = "bluetooth_traits"
path = "lib.rs"

[dependencies]
embedder_traits = { path = "../embedder_traits" }
ipc-channel = "0.14"
regex = "1.1"
serde = "1.0"
embedder_traits = { path = "../embedder_traits" }
34 changes: 17 additions & 17 deletions components/compositing/Cargo.toml
Expand Up @@ -18,30 +18,30 @@ gl = ["gleam", "pixels"]
[dependencies]
canvas = { path = "../canvas" }
crossbeam-channel = "0.4"
embedder_traits = {path = "../embedder_traits"}
embedder_traits = { path = "../embedder_traits" }
euclid = "0.20"
gfx_traits = {path = "../gfx_traits"}
gleam = {version = "0.11", optional = true}
gfx_traits = { path = "../gfx_traits" }
gleam = { version = "0.11", optional = true }
image = "0.23"
ipc-channel = "0.14"
libc = "0.2"
keyboard-types = "0.4.3"
libc = "0.2"
log = "0.4"
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
msg = { path = "../msg" }
net_traits = { path = "../net_traits" }
num-traits = "0.2"
pixels = {path = "../pixels", optional = true}
profile_traits = {path = "../profile_traits"}
script_traits = {path = "../script_traits"}
servo_geometry = {path = "../geometry"}
servo-media = {git = "https://github.com/servo/media"}
servo_url = {path = "../url"}
style_traits = {path = "../style_traits"}
pixels = { path = "../pixels", optional = true }
profile_traits = { path = "../profile_traits" }
script_traits = { path = "../script_traits" }
servo-media = { git = "https://github.com/servo/media" }
servo_geometry = { path = "../geometry" }
servo_url = { path = "../url" }
style_traits = { path = "../style_traits" }
time = "0.1.17"
webrender = {git = "https://github.com/servo/webrender", features = ["capture"]}
webrender_api = {git = "https://github.com/servo/webrender"}
webrender_surfman = {path = "../webrender_surfman"}
webxr = {git = "https://github.com/servo/webxr"}
webrender = { git = "https://github.com/servo/webrender", features = ["capture"] }
webrender_api = { git = "https://github.com/servo/webrender" }
webrender_surfman = { path = "../webrender_surfman" }
webxr = { git = "https://github.com/servo/webxr" }

[build-dependencies]
toml = "0.5"
6 changes: 3 additions & 3 deletions ports/glutin/Cargo.toml
Expand Up @@ -27,17 +27,17 @@ OriginalFilename = "servo.exe"
ProductName = "Servo"

[features]
debugmozjs = ["libservo/debugmozjs"]
default = ["webdriver", "max_log_level"]
egl = ["libservo/egl"]
energy-profiling = ["libservo/energy-profiling"]
debugmozjs = ["libservo/debugmozjs"]
media-dummy = ["libservo/media-dummy"]
media-gstreamer = ["libservo/media-gstreamer"]
jitspew = ["libservo/jitspew"]
js_backtrace = ["libservo/js_backtrace"]
layout-2013 = ["libservo/layout-2013"]
layout-2020 = ["libservo/layout-2020"]
max_log_level = ["log/release_max_level_info"]
media-dummy = ["libservo/media-dummy"]
media-gstreamer = ["libservo/media-gstreamer"]
native-bluetooth = ["libservo/native-bluetooth"]
no-wgl = ["libservo/no-wgl"]
profilemozjs = ["libservo/profilemozjs"]
Expand Down
11 changes: 5 additions & 6 deletions ports/libsimpleservo/api/Cargo.toml
Expand Up @@ -13,9 +13,8 @@ libservo = { path = "../../../components/servo" }
log = "0.4"
servo-media = { git = "https://github.com/servo/media" }
surfman = { version = "0.2", features = ["sm-angle-default"] }

webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
webxr = { git = "https://github.com/servo/webxr"}
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }

[target.'cfg(not(target_os = "macos"))'.dependencies]
libc = "0.2"
Expand All @@ -33,10 +32,8 @@ libloading = "0.5"
gl_generator = "0.14"

[features]
default = ["webdriver", "max_log_level"]
debugmozjs = ["libservo/debugmozjs"]
media-dummy = ["libservo/media-dummy"]
media-gstreamer = ["libservo/media-gstreamer"]
default = ["webdriver", "max_log_level"]
egl = ["libservo/egl"]
energy-profiling = ["libservo/energy-profiling"]
googlevr = ["libservo/googlevr"]
Expand All @@ -45,12 +42,14 @@ js_backtrace = ["libservo/js_backtrace"]
layout-2013 = ["libservo/layout-2013"]
layout-2020 = ["libservo/layout-2020"]
max_log_level = ["log/release_max_level_info"]
media-dummy = ["libservo/media-dummy"]
media-gstreamer = ["libservo/media-gstreamer"]
native-bluetooth = ["libservo/native-bluetooth"]
no_static_freetype = ["libservo/no_static_freetype"]
no-wgl = ["libservo/no-wgl"]
profilemozjs = ["libservo/profilemozjs"]
refcell_backtrace = ["libservo/refcell_backtrace"]
webdriver = ["libservo/webdriver"]
uwp = ["libservo/uwp", "webxr/openxr-api"]
webdriver = ["libservo/webdriver"]
webgl_backtrace = ["libservo/webgl_backtrace"]
xr-profile = ["libservo/xr-profile"]
6 changes: 3 additions & 3 deletions ports/libsimpleservo/capi/Cargo.toml
Expand Up @@ -22,16 +22,14 @@ surfman = "0.2"

[target.'cfg(target_os = "windows")'.dependencies]
libc = "0.2"
winapi = {version = "0.3", features = ["wingdi", "winuser", "winnt", "winbase", "processenv", "namedpipeapi", "ntdef", "minwindef", "handleapi", "debugapi"]}
winapi = { version = "0.3", features = ["wingdi", "winuser", "winnt", "winbase", "processenv", "namedpipeapi", "ntdef", "minwindef", "handleapi", "debugapi"] }

[build-dependencies]
cbindgen = "0.14"

[features]
debugmozjs = ["simpleservo/debugmozjs"]
default = ["webdriver", "max_log_level"]
media-dummy = ["simpleservo/media-dummy"]
media-gstreamer = ["simpleservo/media-gstreamer"]
egl = ["simpleservo/egl"]
energy-profiling = ["simpleservo/energy-profiling"]
googlevr = ["simpleservo/googlevr"]
Expand All @@ -40,6 +38,8 @@ js_backtrace = ["simpleservo/js_backtrace"]
layout-2013 = ["simpleservo/layout-2013"]
layout-2020 = ["simpleservo/layout-2020"]
max_log_level = ["simpleservo/max_log_level"]
media-dummy = ["simpleservo/media-dummy"]
media-gstreamer = ["simpleservo/media-gstreamer"]
native-bluetooth = ["simpleservo/native-bluetooth"]
no-wgl = ["simpleservo/no-wgl"]
profilemozjs = ["simpleservo/profilemozjs"]
Expand Down
4 changes: 2 additions & 2 deletions ports/libsimpleservo/jniapi/Cargo.toml
Expand Up @@ -29,15 +29,15 @@ cc = "1.0"
[features]
debugmozjs = ["simpleservo/debugmozjs"]
default = ["webdriver", "max_log_level"]
media-dummy = ["simpleservo/media-dummy"]
media-gstreamer = ["simpleservo/media-gstreamer"]
egl = ["simpleservo/egl"]
energy-profiling = ["simpleservo/energy-profiling"]
googlevr = ["simpleservo/googlevr"]
js_backtrace = ["simpleservo/js_backtrace"]
layout-2013 = ["simpleservo/layout-2013"]
layout-2020 = ["simpleservo/layout-2020"]
max_log_level = ["simpleservo/max_log_level"]
media-dummy = ["simpleservo/media-dummy"]
media-gstreamer = ["simpleservo/media-gstreamer"]
native-bluetooth = ["simpleservo/native-bluetooth"]
webdriver = ["simpleservo/webdriver"]
webgl_backtrace = ["simpleservo/webgl_backtrace"]

0 comments on commit ede1555

Please sign in to comment.