aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-01-09 07:35:28 -0800
committerGitHub <noreply@github.com>2017-01-09 07:35:28 -0800
commit93ac10d9b1d34e85f9c1b4ba809b20ad6d9d0f90 (patch)
treedfad861e2c612af7a33c2766f72b805eb69356f0
parent518ef39cfd429082dd8dc0d5b13e2db637d08a53 (diff)
parent5f3339d22a82028b70612fa34e38dc52e1d4cd8e (diff)
downloadservo-93ac10d9b1d34e85f9c1b4ba809b20ad6d9d0f90.tar.gz
servo-93ac10d9b1d34e85f9c1b4ba809b20ad6d9d0f90.zip
Auto merge of #14917 - fkautz:pr_out_renaming_default_features_to_default_features_as_per_cargo_s_manifest_format, r=emilio
Renaming default_features to default-features as per Cargo's Manifest Format <!-- 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/14917) <!-- Reviewable:end -->
-rw-r--r--components/canvas/Cargo.toml2
-rw-r--r--components/canvas_traits/Cargo.toml2
-rw-r--r--components/compositing/Cargo.toml2
-rw-r--r--components/constellation/Cargo.toml2
-rw-r--r--components/gfx/Cargo.toml2
-rw-r--r--components/layout/Cargo.toml2
-rw-r--r--components/layout_thread/Cargo.toml2
-rw-r--r--components/layout_traits/Cargo.toml2
-rw-r--r--components/msg/Cargo.toml2
-rw-r--r--components/net/Cargo.toml2
-rw-r--r--components/net_traits/Cargo.toml2
-rw-r--r--components/script/Cargo.toml2
-rw-r--r--components/servo/Cargo.toml2
13 files changed, 13 insertions, 13 deletions
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index 4416e1cb0b3..141bf72644e 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -24,5 +24,5 @@ servo_config = {path = "../config"}
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
-default_features = false
+default-features = false
features = ["serde_derive"]
diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml
index 0f28b2f29a3..3edd00113a7 100644
--- a/components/canvas_traits/Cargo.toml
+++ b/components/canvas_traits/Cargo.toml
@@ -21,5 +21,5 @@ serde_derive = "0.8"
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
-default_features = false
+default-features = false
features = ["serde_derive", "ipc"]
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index 37309714e50..df151471479 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -36,5 +36,5 @@ features = ["serde_derive"]
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
-default_features = false
+default-features = false
features = ["serde_derive", "ipc"]
diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml
index b854d90e764..b10c07703e2 100644
--- a/components/constellation/Cargo.toml
+++ b/components/constellation/Cargo.toml
@@ -40,7 +40,7 @@ webvr_traits = {path = "../webvr_traits"}
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
-default_features = false
+default-features = false
features = ["serde_derive", "ipc"]
[target.'cfg(not(target_os = "windows"))'.dependencies]
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
index 79b6f86916f..d504e0bb138 100644
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@@ -44,7 +44,7 @@ xi-unicode = "0.0.1"
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
-default_features = false
+default-features = false
features = ["serde_derive", "ipc"]
[target.'cfg(target_os = "macos")'.dependencies]
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index 2d896fb5eae..cddd3425d65 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -50,5 +50,5 @@ unicode-script = {version = "0.1", features = ["harfbuzz"]}
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
-default_features = false
+default-features = false
features = ["serde_derive", "ipc"]
diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml
index d99a52061fb..e90892cf805 100644
--- a/components/layout_thread/Cargo.toml
+++ b/components/layout_thread/Cargo.toml
@@ -41,5 +41,5 @@ style = {path = "../style"}
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
-default_features = false
+default-features = false
features = ["serde_derive", "ipc"]
diff --git a/components/layout_traits/Cargo.toml b/components/layout_traits/Cargo.toml
index 204914af714..1464719f51e 100644
--- a/components/layout_traits/Cargo.toml
+++ b/components/layout_traits/Cargo.toml
@@ -20,5 +20,5 @@ servo_url = {path = "../url"}
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
-default_features = false
+default-features = false
features = ["serde_derive", "ipc"]
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
index e52b1132664..dc1ec78bbb9 100644
--- a/components/msg/Cargo.toml
+++ b/components/msg/Cargo.toml
@@ -20,5 +20,5 @@ serde_derive = "0.8"
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
-default_features = false
+default-features = false
features = ["serde_derive", "ipc"]
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index 46d23807df9..e1e57257cb5 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -45,7 +45,7 @@ websocket = "0.17"
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
-default_features = false
+default-features = false
features = ["serde_derive", "ipc"]
[target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]
diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml
index a43158bb9ea..d11ca805dc2 100644
--- a/components/net_traits/Cargo.toml
+++ b/components/net_traits/Cargo.toml
@@ -31,5 +31,5 @@ cookie = {version = "0.2.5", features = ["serialize-rustc"]}
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
-default_features = false
+default-features = false
features = ["serde_derive", "ipc"]
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index f980c2f9226..3ef402a4605 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -87,5 +87,5 @@ webvr_traits = {path = "../webvr_traits"}
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
-default_features = false
+default-features = false
features = ["nightly", "serde_derive", "ipc"]
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index f0ba02d528b..06c1c3ab01e 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -65,7 +65,7 @@ features = ["serde_derive"]
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender"
-default_features = false
+default-features = false
features = ["serde_derive", "ipc"]
[target.'cfg(not(target_os = "android"))'.dependencies]