Some Cargo.toml cleanups

This commit is contained in:
atouchet 2020-05-13 22:09:56 -07:00
parent 6c506ba260
commit ede15557ae
8 changed files with 39 additions and 40 deletions

View file

@ -14,12 +14,12 @@ doctest = false
[dependencies] [dependencies]
backtrace = "0.3" backtrace = "0.3"
crossbeam-channel = "0.4"
ipc-channel = "0.14" ipc-channel = "0.14"
libc = "0.2" libc = "0.2"
log = "0.4" log = "0.4"
msg = {path = "../msg"} msg = { path = "../msg" }
serde_json = "1.0" serde_json = "1.0"
crossbeam-channel = "0.4"
[dev-dependencies] [dev-dependencies]
lazy_static = "1.0" lazy_static = "1.0"

View file

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

View file

@ -11,7 +11,7 @@ name = "bluetooth_traits"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
embedder_traits = { path = "../embedder_traits" }
ipc-channel = "0.14" ipc-channel = "0.14"
regex = "1.1" regex = "1.1"
serde = "1.0" serde = "1.0"
embedder_traits = { path = "../embedder_traits" }

View file

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

View file

@ -27,17 +27,17 @@ OriginalFilename = "servo.exe"
ProductName = "Servo" ProductName = "Servo"
[features] [features]
debugmozjs = ["libservo/debugmozjs"]
default = ["webdriver", "max_log_level"] default = ["webdriver", "max_log_level"]
egl = ["libservo/egl"] egl = ["libservo/egl"]
energy-profiling = ["libservo/energy-profiling"] energy-profiling = ["libservo/energy-profiling"]
debugmozjs = ["libservo/debugmozjs"]
media-dummy = ["libservo/media-dummy"]
media-gstreamer = ["libservo/media-gstreamer"]
jitspew = ["libservo/jitspew"] jitspew = ["libservo/jitspew"]
js_backtrace = ["libservo/js_backtrace"] js_backtrace = ["libservo/js_backtrace"]
layout-2013 = ["libservo/layout-2013"] layout-2013 = ["libservo/layout-2013"]
layout-2020 = ["libservo/layout-2020"] layout-2020 = ["libservo/layout-2020"]
max_log_level = ["log/release_max_level_info"] max_log_level = ["log/release_max_level_info"]
media-dummy = ["libservo/media-dummy"]
media-gstreamer = ["libservo/media-gstreamer"]
native-bluetooth = ["libservo/native-bluetooth"] native-bluetooth = ["libservo/native-bluetooth"]
no-wgl = ["libservo/no-wgl"] no-wgl = ["libservo/no-wgl"]
profilemozjs = ["libservo/profilemozjs"] profilemozjs = ["libservo/profilemozjs"]

View file

@ -13,9 +13,8 @@ libservo = { path = "../../../components/servo" }
log = "0.4" log = "0.4"
servo-media = { git = "https://github.com/servo/media" } servo-media = { git = "https://github.com/servo/media" }
surfman = { version = "0.2", features = ["sm-angle-default"] } 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 = { git = "https://github.com/servo/webxr"}
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
[target.'cfg(not(target_os = "macos"))'.dependencies] [target.'cfg(not(target_os = "macos"))'.dependencies]
libc = "0.2" libc = "0.2"
@ -33,10 +32,8 @@ libloading = "0.5"
gl_generator = "0.14" gl_generator = "0.14"
[features] [features]
default = ["webdriver", "max_log_level"]
debugmozjs = ["libservo/debugmozjs"] debugmozjs = ["libservo/debugmozjs"]
media-dummy = ["libservo/media-dummy"] default = ["webdriver", "max_log_level"]
media-gstreamer = ["libservo/media-gstreamer"]
egl = ["libservo/egl"] egl = ["libservo/egl"]
energy-profiling = ["libservo/energy-profiling"] energy-profiling = ["libservo/energy-profiling"]
googlevr = ["libservo/googlevr"] googlevr = ["libservo/googlevr"]
@ -45,12 +42,14 @@ js_backtrace = ["libservo/js_backtrace"]
layout-2013 = ["libservo/layout-2013"] layout-2013 = ["libservo/layout-2013"]
layout-2020 = ["libservo/layout-2020"] layout-2020 = ["libservo/layout-2020"]
max_log_level = ["log/release_max_level_info"] max_log_level = ["log/release_max_level_info"]
media-dummy = ["libservo/media-dummy"]
media-gstreamer = ["libservo/media-gstreamer"]
native-bluetooth = ["libservo/native-bluetooth"] native-bluetooth = ["libservo/native-bluetooth"]
no_static_freetype = ["libservo/no_static_freetype"] no_static_freetype = ["libservo/no_static_freetype"]
no-wgl = ["libservo/no-wgl"] no-wgl = ["libservo/no-wgl"]
profilemozjs = ["libservo/profilemozjs"] profilemozjs = ["libservo/profilemozjs"]
refcell_backtrace = ["libservo/refcell_backtrace"] refcell_backtrace = ["libservo/refcell_backtrace"]
webdriver = ["libservo/webdriver"]
uwp = ["libservo/uwp", "webxr/openxr-api"] uwp = ["libservo/uwp", "webxr/openxr-api"]
webdriver = ["libservo/webdriver"]
webgl_backtrace = ["libservo/webgl_backtrace"] webgl_backtrace = ["libservo/webgl_backtrace"]
xr-profile = ["libservo/xr-profile"] xr-profile = ["libservo/xr-profile"]

View file

@ -22,7 +22,7 @@ surfman = "0.2"
[target.'cfg(target_os = "windows")'.dependencies] [target.'cfg(target_os = "windows")'.dependencies]
libc = "0.2" 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] [build-dependencies]
cbindgen = "0.14" cbindgen = "0.14"
@ -30,8 +30,6 @@ cbindgen = "0.14"
[features] [features]
debugmozjs = ["simpleservo/debugmozjs"] debugmozjs = ["simpleservo/debugmozjs"]
default = ["webdriver", "max_log_level"] default = ["webdriver", "max_log_level"]
media-dummy = ["simpleservo/media-dummy"]
media-gstreamer = ["simpleservo/media-gstreamer"]
egl = ["simpleservo/egl"] egl = ["simpleservo/egl"]
energy-profiling = ["simpleservo/energy-profiling"] energy-profiling = ["simpleservo/energy-profiling"]
googlevr = ["simpleservo/googlevr"] googlevr = ["simpleservo/googlevr"]
@ -40,6 +38,8 @@ js_backtrace = ["simpleservo/js_backtrace"]
layout-2013 = ["simpleservo/layout-2013"] layout-2013 = ["simpleservo/layout-2013"]
layout-2020 = ["simpleservo/layout-2020"] layout-2020 = ["simpleservo/layout-2020"]
max_log_level = ["simpleservo/max_log_level"] max_log_level = ["simpleservo/max_log_level"]
media-dummy = ["simpleservo/media-dummy"]
media-gstreamer = ["simpleservo/media-gstreamer"]
native-bluetooth = ["simpleservo/native-bluetooth"] native-bluetooth = ["simpleservo/native-bluetooth"]
no-wgl = ["simpleservo/no-wgl"] no-wgl = ["simpleservo/no-wgl"]
profilemozjs = ["simpleservo/profilemozjs"] profilemozjs = ["simpleservo/profilemozjs"]

View file

@ -29,8 +29,6 @@ cc = "1.0"
[features] [features]
debugmozjs = ["simpleservo/debugmozjs"] debugmozjs = ["simpleservo/debugmozjs"]
default = ["webdriver", "max_log_level"] default = ["webdriver", "max_log_level"]
media-dummy = ["simpleservo/media-dummy"]
media-gstreamer = ["simpleservo/media-gstreamer"]
egl = ["simpleservo/egl"] egl = ["simpleservo/egl"]
energy-profiling = ["simpleservo/energy-profiling"] energy-profiling = ["simpleservo/energy-profiling"]
googlevr = ["simpleservo/googlevr"] googlevr = ["simpleservo/googlevr"]
@ -38,6 +36,8 @@ js_backtrace = ["simpleservo/js_backtrace"]
layout-2013 = ["simpleservo/layout-2013"] layout-2013 = ["simpleservo/layout-2013"]
layout-2020 = ["simpleservo/layout-2020"] layout-2020 = ["simpleservo/layout-2020"]
max_log_level = ["simpleservo/max_log_level"] max_log_level = ["simpleservo/max_log_level"]
media-dummy = ["simpleservo/media-dummy"]
media-gstreamer = ["simpleservo/media-gstreamer"]
native-bluetooth = ["simpleservo/native-bluetooth"] native-bluetooth = ["simpleservo/native-bluetooth"]
webdriver = ["simpleservo/webdriver"] webdriver = ["simpleservo/webdriver"]
webgl_backtrace = ["simpleservo/webgl_backtrace"] webgl_backtrace = ["simpleservo/webgl_backtrace"]