Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch some crates to the 2018 edition #22086

Merged
merged 8 commits into from Nov 6, 2018
Next

Rename mozjs to js in script through Cargo rather than `extern crate`

  • Loading branch information
SimonSapin committed Nov 6, 2018
commit 86f0431f16e95457a82546a783df16fee193ade6
@@ -1,3 +1,5 @@
cargo-features = ["rename-dependency"]

[package]
name = "script"
version = "0.0.1"
@@ -12,7 +14,7 @@ name = "script"
path = "lib.rs"

[features]
debugmozjs = ['mozjs/debugmozjs']
debugmozjs = ['js/debugmozjs']
unstable = []
unrooted_must_root_lint = ["script_plugins/unrooted_must_root_lint"]
default = ["unrooted_must_root_lint"]
@@ -60,6 +62,7 @@ hyper_serde = "0.9"
image = "0.19"
ipc-channel = "0.11"
itertools = "0.7.6"
js = {package = "mozjs", version = "0.9.3"}
jstraceable_derive = {path = "../jstraceable_derive"}
keyboard-types = {version = "0.4.2-servo", features = ["serde"]}
lazy_static = "1"
@@ -71,7 +74,6 @@ metrics = {path = "../metrics"}
mitochondria = "1.1.2"
mime = "0.3"
mime_guess = "2.0.0-alpha.6"
mozjs = "0.9.3"
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
num-traits = "0.2"
@@ -55,6 +55,8 @@ extern crate hyper_serde;
extern crate image;
extern crate ipc_channel;
#[macro_use]
extern crate js;
#[macro_use]
extern crate jstraceable_derive;
extern crate keyboard_types;
#[macro_use]
@@ -71,8 +73,6 @@ extern crate mime;
extern crate mime_guess;
extern crate mitochondria;
extern crate mozangle;
#[macro_use]
extern crate mozjs as js;
extern crate msg;
extern crate net_traits;
extern crate num_traits;
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.