aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-02-20 03:20:26 -0800
committerGitHub <noreply@github.com>2017-02-20 03:20:26 -0800
commita1e4c547f042bf74c638fdff4b3faacf0b96558d (patch)
treea62b93c49deab075fffd8ed9f932da7af1d71563
parent30a31fb744a2fd2b11b901d722704fe458df3022 (diff)
parentf625c76d46d348912aba5147f6d898d4128737d9 (diff)
downloadservo-a1e4c547f042bf74c638fdff4b3faacf0b96558d.tar.gz
servo-a1e4c547f042bf74c638fdff4b3faacf0b96558d.zip
Auto merge of #15656 - servo:pub-crate, r=emilio
Add more public crates to libservo. Fixes #15640. <!-- 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/15656) <!-- Reviewable:end -->
-rw-r--r--Cargo.lock2
-rw-r--r--components/servo/Cargo.toml2
-rw-r--r--components/servo/lib.rs4
3 files changed, 7 insertions, 1 deletions
diff --git a/Cargo.lock b/Cargo.lock
index f7b8ccccbcd..5f8a1f363c2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1496,8 +1496,10 @@ dependencies = [
"script_layout_interface 0.0.1",
"script_traits 0.0.1",
"servo_config 0.0.1",
+ "servo_geometry 0.0.1",
"servo_url 0.0.1",
"style 0.0.1",
+ "style_traits 0.0.1",
"webdriver_server 0.0.1",
"webrender 0.17.0 (git+https://github.com/servo/webrender)",
"webrender_traits 0.16.0 (git+https://github.com/servo/webrender)",
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 8c66ba323b8..80d2ba08b5c 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -47,8 +47,10 @@ script = {path = "../script"}
script_layout_interface = {path = "../script_layout_interface"}
script_traits = {path = "../script_traits"}
servo_config = {path = "../config"}
+servo_geometry = {path = "../geometry"}
servo_url = {path = "../url"}
style = {path = "../style", features = ["servo"]}
+style_traits = {path = "../style_traits", features = ["servo"]}
webvr = {path = "../webvr"}
webvr_traits = {path = "../webvr_traits"}
webdriver_server = {path = "../webdriver_server", optional = true}
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 6e273601926..3ba9f33d5d3 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -45,8 +45,11 @@ pub extern crate script;
pub extern crate script_traits;
pub extern crate script_layout_interface;
pub extern crate servo_config;
+pub extern crate servo_geometry;
pub extern crate servo_url;
pub extern crate style;
+pub extern crate style_traits;
+pub extern crate webrender_traits;
pub extern crate webvr;
pub extern crate webvr_traits;
@@ -54,7 +57,6 @@ pub extern crate webvr_traits;
extern crate webdriver_server;
extern crate webrender;
-extern crate webrender_traits;
#[cfg(feature = "webdriver")]
fn webdriver(port: u16, constellation: Sender<ConstellationMsg>) {