mirror of
https://github.com/servo/servo.git
synced 2025-07-23 07:13:52 +01:00
Auto merge of #26721 - atouchet:master, 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
GitHub
commit
a509c33abf
10 changed files with 103 additions and 106 deletions
|
|
@ -13,31 +13,31 @@ test = false
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
content-security-policy = {version = "0.4.0", features = ["serde"]}
|
||||
content-security-policy = { version = "0.4.0", features = ["serde"] }
|
||||
cookie = "0.11"
|
||||
embedder_traits = { path = "../embedder_traits" }
|
||||
headers = "0.2"
|
||||
http = "0.1"
|
||||
hyper = "0.12"
|
||||
hyper_serde = "0.11"
|
||||
piston_image = {package = "image", version = "0.23"}
|
||||
ipc-channel = "0.14"
|
||||
lazy_static = "1"
|
||||
log = "0.4"
|
||||
malloc_size_of = { path = "../malloc_size_of" }
|
||||
malloc_size_of_derive = "0.1"
|
||||
mime = "0.3"
|
||||
msg = {path = "../msg"}
|
||||
msg = { path = "../msg" }
|
||||
num-traits = "0.2"
|
||||
percent-encoding = "2.0"
|
||||
pixels = {path = "../pixels"}
|
||||
piston_image = { package = "image", version = "0.23" }
|
||||
pixels = { path = "../pixels" }
|
||||
serde = "1.0"
|
||||
servo_arc = {path = "../servo_arc"}
|
||||
servo_url = {path = "../url"}
|
||||
servo_arc = { path = "../servo_arc" }
|
||||
servo_url = { path = "../url" }
|
||||
time = "0.1"
|
||||
url = "2.0"
|
||||
uuid = {version = "0.8", features = ["v4", "serde"]}
|
||||
webrender_api = {git = "https://github.com/servo/webrender"}
|
||||
uuid = { version = "0.8", features = ["v4", "serde"] }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
|
||||
[dev-dependencies]
|
||||
std_test_override = { path = "../std_test_override" }
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@ path = "lib.rs"
|
|||
|
||||
[dependencies]
|
||||
euclid = "0.20"
|
||||
malloc_size_of = {path = "../malloc_size_of"}
|
||||
malloc_size_of = { path = "../malloc_size_of" }
|
||||
malloc_size_of_derive = "0.1"
|
||||
serde = {version = "1", features = ["derive"]}
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
|
|
|
|||
|
|
@ -11,21 +11,21 @@ name = "profile"
|
|||
path = "lib.rs"
|
||||
|
||||
[dependencies]
|
||||
profile_traits = {path = "../profile_traits"}
|
||||
ipc-channel = "0.14"
|
||||
heartbeats-simple = "0.4"
|
||||
ipc-channel = "0.14"
|
||||
log = "0.4"
|
||||
profile_traits = { path = "../profile_traits" }
|
||||
serde = "1.0"
|
||||
serde_json = "1.0"
|
||||
servo_config = {path = "../config"}
|
||||
time_crate = {package = "time", version = "0.1.12"}
|
||||
servo_config = { path = "../config" }
|
||||
time_crate = { package = "time", version = "0.1.12" }
|
||||
|
||||
[target.'cfg(target_os = "macos")'.dependencies]
|
||||
task_info = {path = "../../support/rust-task_info"}
|
||||
task_info = { path = "../../support/rust-task_info" }
|
||||
|
||||
[target.'cfg(target_os = "linux")'.dependencies]
|
||||
regex = "1.1"
|
||||
|
||||
[target.'cfg(not(target_os = "windows"))'.dependencies]
|
||||
libc = "0.2"
|
||||
servo_allocator = {path = "../allocator"}
|
||||
servo_allocator = { path = "../allocator" }
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@ name = "profile_traits"
|
|||
path = "lib.rs"
|
||||
|
||||
[features]
|
||||
energy-profiling = ["energymon", "energy-monitor"]
|
||||
energy-profiling = ["energy-monitor", "energymon"]
|
||||
|
||||
[dependencies]
|
||||
crossbeam-channel = "0.4"
|
||||
energy-monitor = {version = "0.2.0", optional = true}
|
||||
energymon = {git = "https://github.com/energymon/energymon-rust.git", optional = true}
|
||||
energy-monitor = { version = "0.2.0", optional = true }
|
||||
energymon = { git = "https://github.com/energymon/energymon-rust.git", optional = true }
|
||||
ipc-channel = "0.14"
|
||||
log = "0.4"
|
||||
serde = "1.0"
|
||||
servo_config = {path = "../config"}
|
||||
signpost = {git = "https://github.com/pcwalton/signpost.git"}
|
||||
servo_config = { path = "../config" }
|
||||
signpost = { git = "https://github.com/pcwalton/signpost.git" }
|
||||
time = "0.1.12"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
[package]
|
||||
|
||||
name = "range"
|
||||
version = "0.0.1"
|
||||
authors = ["The Servo Project Developers"]
|
||||
|
|
|
|||
|
|
@ -13,27 +13,27 @@ path = "lib.rs"
|
|||
[dependencies]
|
||||
app_units = "0.7"
|
||||
atomic_refcell = "0.1"
|
||||
canvas_traits = {path = "../canvas_traits"}
|
||||
canvas_traits = { path = "../canvas_traits" }
|
||||
crossbeam-channel = "0.4"
|
||||
euclid = "0.20"
|
||||
fxhash = "0.2"
|
||||
gfx_traits = {path = "../gfx_traits"}
|
||||
gfx_traits = { path = "../gfx_traits" }
|
||||
html5ever = "0.25"
|
||||
ipc-channel = "0.14"
|
||||
libc = "0.2"
|
||||
malloc_size_of = { path = "../malloc_size_of" }
|
||||
malloc_size_of_derive = "0.1"
|
||||
metrics = {path = "../metrics"}
|
||||
msg = {path = "../msg"}
|
||||
net_traits = {path = "../net_traits"}
|
||||
metrics = { path = "../metrics" }
|
||||
msg = { path = "../msg" }
|
||||
net_traits = { path = "../net_traits" }
|
||||
parking_lot = "0.10"
|
||||
profile_traits = {path = "../profile_traits"}
|
||||
range = {path = "../range"}
|
||||
script_traits = {path = "../script_traits"}
|
||||
profile_traits = { path = "../profile_traits" }
|
||||
range = { path = "../range" }
|
||||
script_traits = { path = "../script_traits" }
|
||||
selectors = { path = "../selectors" }
|
||||
servo_arc = {path = "../servo_arc"}
|
||||
servo_atoms = {path = "../atoms"}
|
||||
servo_url = {path = "../url"}
|
||||
style = {path = "../style", features = ["servo"]}
|
||||
style_traits = {path = "../style_traits", features = ["servo"]}
|
||||
webrender_api = {git = "https://github.com/servo/webrender"}
|
||||
servo_arc = { path = "../servo_arc" }
|
||||
servo_atoms = { path = "../atoms" }
|
||||
servo_url = { path = "../url" }
|
||||
style = { path = "../style", features = ["servo"] }
|
||||
style_traits = { path = "../style_traits", features = ["servo"] }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@ path = "lib.rs"
|
|||
|
||||
[dependencies]
|
||||
bitflags = "1.0"
|
||||
bluetooth_traits = {path = "../bluetooth_traits"}
|
||||
canvas_traits = {path = "../canvas_traits"}
|
||||
bluetooth_traits = { path = "../bluetooth_traits" }
|
||||
canvas_traits = { path = "../canvas_traits" }
|
||||
cookie = "0.11"
|
||||
crossbeam-channel = "0.4"
|
||||
devtools_traits = {path = "../devtools_traits"}
|
||||
embedder_traits = {path = "../embedder_traits"}
|
||||
devtools_traits = { path = "../devtools_traits" }
|
||||
embedder_traits = { path = "../embedder_traits" }
|
||||
euclid = "0.20"
|
||||
gfx_traits = {path = "../gfx_traits"}
|
||||
gfx_traits = { path = "../gfx_traits" }
|
||||
http = "0.1"
|
||||
hyper = "0.12"
|
||||
hyper_serde = "0.11"
|
||||
|
|
@ -29,19 +29,19 @@ libc = "0.2"
|
|||
log = "0.4"
|
||||
malloc_size_of = { path = "../malloc_size_of" }
|
||||
malloc_size_of_derive = "0.1"
|
||||
media = {path = "../media"}
|
||||
msg = {path = "../msg"}
|
||||
net_traits = {path = "../net_traits"}
|
||||
pixels = {path = "../pixels"}
|
||||
profile_traits = {path = "../profile_traits"}
|
||||
media = { path = "../media" }
|
||||
msg = { path = "../msg" }
|
||||
net_traits = { path = "../net_traits" }
|
||||
pixels = { path = "../pixels" }
|
||||
profile_traits = { path = "../profile_traits" }
|
||||
serde = "1.0"
|
||||
servo_atoms = {path = "../atoms"}
|
||||
servo_url = {path = "../url"}
|
||||
servo_atoms = { path = "../atoms" }
|
||||
servo_url = { path = "../url" }
|
||||
smallvec = "0.6"
|
||||
style_traits = {path = "../style_traits", features = ["servo"]}
|
||||
style_traits = { path = "../style_traits", features = ["servo"] }
|
||||
time = "0.1.12"
|
||||
uuid = {version = "0.8", features = ["v4"]}
|
||||
uuid = { version = "0.8", features = ["v4"] }
|
||||
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"] }
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
[package]
|
||||
|
||||
name = "selectors"
|
||||
version = "0.22.0"
|
||||
authors = ["The Servo Project Developers"]
|
||||
documentation = "https://docs.rs/selectors/"
|
||||
|
||||
description = "CSS Selectors matching for Rust"
|
||||
repository = "https://github.com/servo/servo"
|
||||
readme = "README.md"
|
||||
|
|
@ -23,8 +21,8 @@ bench = []
|
|||
bitflags = "1.0"
|
||||
cssparser = "0.27"
|
||||
derive_more = "0.99"
|
||||
log = "0.4"
|
||||
fxhash = "0.2"
|
||||
log = "0.4"
|
||||
phf = "0.8"
|
||||
precomputed-hash = "0.1"
|
||||
servo_arc = { version = "0.1", path = "../servo_arc" }
|
||||
|
|
|
|||
|
|
@ -15,82 +15,82 @@ crate-type = ["rlib"]
|
|||
debugmozjs = ["script/debugmozjs"]
|
||||
egl = ["mozangle/egl"]
|
||||
energy-profiling = ["profile_traits/energy-profiling"]
|
||||
profilemozjs = ["script/profilemozjs"]
|
||||
googlevr = ["webxr/googlevr"]
|
||||
jitspew = ["script/jitspew"]
|
||||
js_backtrace = ["script/js_backtrace"]
|
||||
layout-2013 = ["layout_thread_2013"]
|
||||
layout-2020 = ["layout_thread_2020"]
|
||||
max_log_level = ["log/release_max_level_info"]
|
||||
media-dummy = ["servo-media-dummy"]
|
||||
media-gstreamer = ["servo-media-gstreamer", "gstreamer"]
|
||||
native-bluetooth = ["bluetooth/native-bluetooth"]
|
||||
no-wgl = ["canvas/no-wgl"]
|
||||
uwp = ["servo_config/uwp", "script/uwp"]
|
||||
webrender_debugger = ["webrender/debugger"]
|
||||
no_static_freetype = ["webrender/no_static_freetype"]
|
||||
profilemozjs = ["script/profilemozjs"]
|
||||
refcell_backtrace = ["script/refcell_backtrace"]
|
||||
uwp = ["servo_config/uwp", "script/uwp"]
|
||||
webdriver = ["webdriver_server"]
|
||||
webgl_backtrace = [
|
||||
"script/webgl_backtrace",
|
||||
"canvas/webgl_backtrace",
|
||||
"canvas_traits/webgl_backtrace",
|
||||
]
|
||||
media-dummy = ["servo-media-dummy"]
|
||||
media-gstreamer = ["servo-media-gstreamer", "gstreamer"]
|
||||
webrender_debugger = ["webrender/debugger"]
|
||||
xr-profile = ["canvas/xr-profile", "canvas_traits/xr-profile", "script/xr-profile", "webxr/profile"]
|
||||
|
||||
[dependencies]
|
||||
background_hang_monitor = {path = "../background_hang_monitor"}
|
||||
bluetooth_traits = {path = "../bluetooth_traits"}
|
||||
bluetooth = {path = "../bluetooth"}
|
||||
canvas = {path = "../canvas", default-features = false}
|
||||
canvas_traits = {path = "../canvas_traits"}
|
||||
compositing = {path = "../compositing", features = ["gl"]}
|
||||
constellation = {path = "../constellation"}
|
||||
background_hang_monitor = { path = "../background_hang_monitor" }
|
||||
bluetooth = { path = "../bluetooth" }
|
||||
bluetooth_traits = { path = "../bluetooth_traits" }
|
||||
canvas = { path = "../canvas", default-features = false }
|
||||
canvas_traits = { path = "../canvas_traits" }
|
||||
compositing = { path = "../compositing", features = ["gl"] }
|
||||
constellation = { path = "../constellation" }
|
||||
crossbeam-channel = "0.4"
|
||||
debugger = {path = "../debugger"}
|
||||
devtools = {path = "../devtools"}
|
||||
devtools_traits = {path = "../devtools_traits"}
|
||||
embedder_traits = {path = "../embedder_traits"}
|
||||
debugger = { path = "../debugger" }
|
||||
devtools = { path = "../devtools" }
|
||||
devtools_traits = { path = "../devtools_traits" }
|
||||
embedder_traits = { path = "../embedder_traits" }
|
||||
env_logger = "0.7"
|
||||
euclid = "0.20"
|
||||
gfx = {path = "../gfx"}
|
||||
gfx = { path = "../gfx" }
|
||||
gleam = "0.11"
|
||||
gstreamer = { version = "0.15", optional = true }
|
||||
ipc-channel = "0.14"
|
||||
keyboard-types = "0.4"
|
||||
layout_thread_2013 = {path = "../layout_thread", optional = true}
|
||||
layout_thread_2020 = {path = "../layout_thread_2020", optional = true}
|
||||
layout_thread_2013 = { path = "../layout_thread", optional = true }
|
||||
layout_thread_2020 = { path = "../layout_thread_2020", optional = true }
|
||||
log = "0.4"
|
||||
media = {path = "../media"}
|
||||
msg = {path = "../msg"}
|
||||
net = {path = "../net"}
|
||||
net_traits = {path = "../net_traits"}
|
||||
profile = {path = "../profile"}
|
||||
profile_traits = {path = "../profile_traits"}
|
||||
script = {path = "../script"}
|
||||
script_layout_interface = {path = "../script_layout_interface"}
|
||||
script_traits = {path = "../script_traits"}
|
||||
servo_config = {path = "../config"}
|
||||
servo_geometry = {path = "../geometry"}
|
||||
servo-media = {git = "https://github.com/servo/media"}
|
||||
servo-media-dummy = {git = "https://github.com/servo/media", optional = true}
|
||||
servo-media-gstreamer = {git = "https://github.com/servo/media", optional = true}
|
||||
servo_url = {path = "../url"}
|
||||
media = { path = "../media" }
|
||||
msg = { path = "../msg" }
|
||||
net = { path = "../net" }
|
||||
net_traits = { path = "../net_traits" }
|
||||
profile = { path = "../profile" }
|
||||
profile_traits = { path = "../profile_traits" }
|
||||
script = { path = "../script" }
|
||||
script_layout_interface = { path = "../script_layout_interface" }
|
||||
script_traits = { path = "../script_traits" }
|
||||
servo-media = { git = "https://github.com/servo/media" }
|
||||
servo-media-dummy = { git = "https://github.com/servo/media", optional = true }
|
||||
servo-media-gstreamer = { git = "https://github.com/servo/media", optional = true }
|
||||
servo_config = { path = "../config" }
|
||||
servo_geometry = { path = "../geometry" }
|
||||
servo_url = { path = "../url" }
|
||||
sparkle = "0.1"
|
||||
style = {path = "../style", features = ["servo"]}
|
||||
style_traits = {path = "../style_traits", features = ["servo"]}
|
||||
webgpu = {path = "../webgpu"}
|
||||
webrender = {git = "https://github.com/servo/webrender"}
|
||||
webrender_api = {git = "https://github.com/servo/webrender"}
|
||||
webrender_surfman = {path = "../webrender_surfman"}
|
||||
webrender_traits = {path = "../webrender_traits"}
|
||||
webdriver_server = {path = "../webdriver_server", optional = true}
|
||||
webxr-api = {git = "https://github.com/servo/webxr"}
|
||||
webxr = {git = "https://github.com/servo/webxr"}
|
||||
style = { path = "../style", features = ["servo"] }
|
||||
style_traits = { path = "../style_traits", features = ["servo"] }
|
||||
surfman = "0.2"
|
||||
gstreamer = { version = "0.15", optional = true }
|
||||
webdriver_server = { path = "../webdriver_server", optional = true }
|
||||
webgpu = { path = "../webgpu" }
|
||||
webrender = { git = "https://github.com/servo/webrender" }
|
||||
webrender_api = { git = "https://github.com/servo/webrender" }
|
||||
webrender_surfman = { path = "../webrender_surfman" }
|
||||
webrender_traits = { path = "../webrender_traits" }
|
||||
webxr = { git = "https://github.com/servo/webxr" }
|
||||
webxr-api = { git = "https://github.com/servo/webxr" }
|
||||
|
||||
[target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies]
|
||||
[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"
|
||||
|
||||
[target.'cfg(target_os = "windows")'.dependencies]
|
||||
mozangle = {version = "0.2"}
|
||||
mozangle = { version = "0.2" }
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ name = "servo_arc"
|
|||
path = "lib.rs"
|
||||
|
||||
[features]
|
||||
servo = ["serde"]
|
||||
gecko_refcount_logging = []
|
||||
servo = ["serde"]
|
||||
|
||||
[dependencies]
|
||||
nodrop = {version = "0.1.8"}
|
||||
serde = {version = "1.0", optional = true}
|
||||
nodrop = { version = "0.1.8" }
|
||||
serde = { version = "1.0", optional = true }
|
||||
stable_deref_trait = "1.0.0"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue