mirror of
https://github.com/servo/servo.git
synced 2025-08-05 21:50:18 +01:00
Auto merge of #19138 - asajeffrey:script-rename-js-dependency-to-mozjs, r=jdm
Rename js crate to mozjs <!-- Please describe your changes on the following line: --> This PR renames the `js` dependency to `mozjs', ready for when https://github.com/servo/rust-mozjs/pull/377 lands. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes do not require tests because refactoring <!-- 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. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19138) <!-- Reviewable:end -->
This commit is contained in:
commit
5b36b74c06
5 changed files with 26 additions and 27 deletions
|
@ -9,14 +9,14 @@ publish = false
|
|||
path = "lib.rs"
|
||||
|
||||
[features]
|
||||
servo = ["js", "string_cache", "url", "webrender_api", "xml5ever"]
|
||||
servo = ["mozjs", "string_cache", "url", "webrender_api", "xml5ever"]
|
||||
|
||||
[dependencies]
|
||||
app_units = "0.5.5"
|
||||
cssparser = "0.22.0"
|
||||
euclid = "0.15"
|
||||
hashglobe = { path = "../hashglobe" }
|
||||
js = { git = "https://github.com/servo/rust-mozjs", features = ["promises"], optional = true }
|
||||
mozjs = { version = "0.1.7", features = ["promises"], optional = true }
|
||||
servo_arc = { path = "../servo_arc" }
|
||||
smallbitvec = "1.0.3"
|
||||
smallvec = "0.4"
|
||||
|
|
|
@ -48,7 +48,7 @@ extern crate cssparser;
|
|||
extern crate euclid;
|
||||
extern crate hashglobe;
|
||||
#[cfg(feature = "servo")]
|
||||
extern crate js;
|
||||
extern crate mozjs as js;
|
||||
extern crate servo_arc;
|
||||
extern crate smallbitvec;
|
||||
extern crate smallvec;
|
||||
|
|
|
@ -12,7 +12,7 @@ name = "script"
|
|||
path = "lib.rs"
|
||||
|
||||
[features]
|
||||
debugmozjs = ['js/debugmozjs']
|
||||
debugmozjs = ['mozjs/debugmozjs']
|
||||
unstable = ["servo_allocator/unstable"]
|
||||
unrooted_must_root_lint = ["script_plugins/unrooted_must_root_lint"]
|
||||
default = ["unrooted_must_root_lint"]
|
||||
|
@ -51,7 +51,7 @@ hyper = "0.10"
|
|||
hyper_serde = "0.7"
|
||||
image = "0.16"
|
||||
ipc-channel = "0.9"
|
||||
js = {git = "https://github.com/servo/rust-mozjs", features = ["promises"]}
|
||||
mozjs = { version = "0.1.7", features = ["promises"]}
|
||||
jstraceable_derive = {path = "../jstraceable_derive"}
|
||||
lazy_static = "0.2"
|
||||
libc = "0.2"
|
||||
|
|
|
@ -47,8 +47,6 @@ extern crate hyper_serde;
|
|||
extern crate image;
|
||||
extern crate ipc_channel;
|
||||
#[macro_use]
|
||||
extern crate js;
|
||||
#[macro_use]
|
||||
extern crate jstraceable_derive;
|
||||
#[macro_use]
|
||||
extern crate lazy_static;
|
||||
|
@ -62,6 +60,8 @@ extern crate metrics;
|
|||
extern crate mime;
|
||||
extern crate mime_guess;
|
||||
extern crate mitochondria;
|
||||
#[macro_use]
|
||||
extern crate mozjs as js;
|
||||
extern crate msg;
|
||||
extern crate net_traits;
|
||||
extern crate nonzero;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue