diff options
-rw-r--r-- | components/script/dom/bindings/conversions.rs | 2 | ||||
-rw-r--r-- | components/script/dom/bindings/utils.rs | 2 | ||||
-rw-r--r-- | components/servo/Cargo.toml | 1 | ||||
-rw-r--r-- | components/util/Cargo.toml | 16 | ||||
-rw-r--r-- | components/util/lib.rs | 11 | ||||
-rw-r--r-- | components/util/mem.rs | 81 | ||||
-rw-r--r-- | components/util/non_geckolib.rs | 171 | ||||
-rw-r--r-- | components/util/str.rs | 87 | ||||
-rw-r--r-- | ports/cef/Cargo.toml | 1 | ||||
-rw-r--r-- | ports/geckolib/Cargo.lock | 691 | ||||
-rw-r--r-- | ports/gonk/Cargo.toml | 1 |
11 files changed, 204 insertions, 860 deletions
diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs index f9031d3369d..1509276db31 100644 --- a/components/script/dom/bindings/conversions.rs +++ b/components/script/dom/bindings/conversions.rs @@ -55,8 +55,8 @@ use js::rust::ToString; use libc; use num::Float; use std::{ptr, mem, slice}; +pub use util::non_geckolib::{StringificationBehavior, jsstring_to_str}; use util::str::DOMString; -pub use util::str::{StringificationBehavior, jsstring_to_str}; /// A trait to check whether a given `JSObject` implements an IDL interface. pub trait IDLInterface { diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index 9aa4b9cf0b6..46ea2e78aa1 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -50,7 +50,7 @@ use std::default::Default; use std::ffi::CString; use std::ptr; use util::mem::HeapSizeOf; -use util::str::jsstring_to_str; +use util::non_geckolib::jsstring_to_str; /// Proxy handler for a WindowProxy. pub struct WindowProxyHandler(pub *const libc::c_void); diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 917e7d1de1d..8df856c6967 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -81,6 +81,7 @@ path = "../profile_traits" [dependencies.util] path = "../util" +features = ["non-geckolib"] [dependencies.script] path = "../script" diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml index 5a73b0b8144..4dbe032de5b 100644 --- a/components/util/Cargo.toml +++ b/components/util/Cargo.toml @@ -15,19 +15,31 @@ path = "lib.rs" # See https://github.com/rust-lang/rust/issues/21246 doctest = false +[features] + +# This feature allows us to avoid depending on various things we don't need for +# GeckoLib builds. Conceptually, it would make more sense to have a "geckolib" +# feature, but Cargo is generally set up for features to add dependencies, not +# remove them. So we do it this way, and request that all non-GeckoLib builds +# set this feature. +non-geckolib = ["azure", "js", "layers", "html5ever", "hyper"] + [dependencies.plugins] path = "../plugins" [dependencies.azure] git = "https://github.com/servo/rust-azure" features = ["plugins"] +optional = true [dependencies.js] git = "https://github.com/servo/rust-mozjs" +optional = true [dependencies.layers] git = "https://github.com/servo/rust-layers" features = ["plugins"] +optional = true [dependencies.ipc-channel] git = "https://github.com/servo/ipc-channel" @@ -37,7 +49,7 @@ app_units = {version = "0.1", features = ["plugins"]} cssparser = { version = "0.4", features = [ "serde-serialization" ] } log = "0.3" bitflags = "0.3" -html5ever = { version = "0.2.1", features = ["unstable"] } +html5ever = { version = "0.2.1", features = ["unstable"], optional = true } libc = "0.2" rand = "0.3" rustc-serialize = "0.3" @@ -51,6 +63,6 @@ serde_macros = "0.6" string_cache = "0.2" lazy_static = "0.1" getopts = "0.2.11" -hyper = "0.7" +hyper = { version = "0.7", optional = true } url = {version = "0.5.2", features = ["serde_serialization"]} uuid = "0.1.17" diff --git a/components/util/lib.rs b/components/util/lib.rs index 2630d83fbe6..660945d4c1a 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -6,7 +6,7 @@ #![feature(box_syntax)] #![feature(core_intrinsics)] #![feature(custom_derive)] -#![feature(decode_utf16)] +#![cfg_attr(feature = "non-geckolib", feature(decode_utf16))] #![feature(fnbox)] #![feature(hashmap_hasher)] #![feature(heap_api)] @@ -22,6 +22,7 @@ extern crate alloc; extern crate app_units; +#[cfg(feature = "non-geckolib")] extern crate azure; #[macro_use] extern crate bitflags; @@ -29,10 +30,14 @@ extern crate bitflags; extern crate cssparser; extern crate euclid; extern crate getopts; +#[cfg(feature = "non-geckolib")] extern crate html5ever; +#[cfg(feature = "non-geckolib")] extern crate hyper; extern crate ipc_channel; +#[cfg(feature = "non-geckolib")] extern crate js; +#[cfg(feature = "non-geckolib")] extern crate layers; #[macro_use] extern crate lazy_static; @@ -61,7 +66,9 @@ pub mod geometry; pub mod ipc; pub mod linked_list; pub mod logical_geometry; -pub mod mem; +#[macro_use] pub mod mem; +#[cfg(feature = "non-geckolib")] +pub mod non_geckolib; pub mod opts; pub mod persistent_list; pub mod prefs; diff --git a/components/util/mem.rs b/components/util/mem.rs index 6c60186ff0e..bc7fe82663c 100644 --- a/components/util/mem.rs +++ b/components/util/mem.rs @@ -5,7 +5,6 @@ //! Data structure measurement. use app_units::Au; -use azure::azure_hl::Color; use cssparser::Color as CSSParserColor; use cssparser::{RGBA, TokenSerializationType}; use cursor::Cursor; @@ -13,15 +12,6 @@ use euclid::length::Length; use euclid::scale_factor::ScaleFactor; use euclid::{Matrix2D, Matrix4, Point2D, Rect, SideOffsets2D, Size2D}; use geometry::{PagePx, ViewportPx}; -use html5ever::tree_builder::QuirksMode; -use hyper::header::ContentType; -use hyper::http::RawStatus; -use hyper::method::Method; -use hyper::mime::{Attr, Mime, SubLevel, TopLevel, Value}; -use js::jsapi::Heap; -use js::jsval::JSVal; -use js::rust::GCMethods; -use layers::geometry::DevicePixel; use libc::{c_void, size_t}; use logical_geometry::WritingMode; use rand::OsRng; @@ -303,22 +293,6 @@ macro_rules! known_heap_size( ); ); -// This is measured properly by the heap measurement implemented in SpiderMonkey. -impl<T: Copy + GCMethods<T>> HeapSizeOf for Heap<T> { - fn heap_size_of_children(&self) -> usize { - 0 - } -} - -impl HeapSizeOf for Method { - fn heap_size_of_children(&self) -> usize { - match *self { - Method::Extension(ref str) => str.heap_size_of_children(), - _ => 0 - } - } -} - impl<T: HeapSizeOf, U: HeapSizeOf> HeapSizeOf for Result<T, U> { fn heap_size_of_children(&self) -> usize { match *self { @@ -365,57 +339,6 @@ impl HeapSizeOf for SimpleSelector { } } -impl HeapSizeOf for ContentType { - fn heap_size_of_children(&self) -> usize { - let &ContentType(ref mime) = self; - mime.heap_size_of_children() - } -} - -impl HeapSizeOf for Mime { - fn heap_size_of_children(&self) -> usize { - let &Mime(ref top_level, ref sub_level, ref vec) = self; - top_level.heap_size_of_children() + sub_level.heap_size_of_children() + - vec.heap_size_of_children() - } -} - -impl HeapSizeOf for TopLevel { - fn heap_size_of_children(&self) -> usize { - match *self { - TopLevel::Ext(ref str) => str.heap_size_of_children(), - _ => 0 - } - } -} - -impl HeapSizeOf for SubLevel { - fn heap_size_of_children(&self) -> usize { - match *self { - SubLevel::Ext(ref str) => str.heap_size_of_children(), - _ => 0 - } - } -} - -impl HeapSizeOf for Attr { - fn heap_size_of_children(&self) -> usize { - match *self { - Attr::Ext(ref str) => str.heap_size_of_children(), - _ => 0 - } - } -} - -impl HeapSizeOf for Value { - fn heap_size_of_children(&self) -> usize { - match *self { - Value::Ext(ref str) => str.heap_size_of_children(), - _ => 0 - } - } -} - known_heap_size!(0, u8, u16, u32, u64, usize); known_heap_size!(0, i8, i16, i32, i64, isize); known_heap_size!(0, bool, f32, f64); @@ -424,8 +347,8 @@ known_heap_size!(0, AtomicIsize, AtomicUsize); known_heap_size!(0, Rect<T>, Point2D<T>, Size2D<T>, Matrix2D<T>, SideOffsets2D<T>, Range<T>); known_heap_size!(0, Length<T, U>, ScaleFactor<T, U, V>); -known_heap_size!(0, Au, WritingMode, CSSParserColor, Color, RGBA, Cursor, Matrix4, QualName, Atom, Namespace); -known_heap_size!(0, JSVal, PagePx, ViewportPx, DevicePixel, QuirksMode, OsRng, RawStatus); +known_heap_size!(0, Au, WritingMode, CSSParserColor, RGBA, Cursor, Matrix4, QualName, Atom, Namespace); +known_heap_size!(0, PagePx, ViewportPx, OsRng); known_heap_size!(0, TokenSerializationType, LengthOrPercentageOrAuto); known_heap_size!(0, ElementState, Combinator, PseudoElement, str); diff --git a/components/util/non_geckolib.rs b/components/util/non_geckolib.rs new file mode 100644 index 00000000000..f7e6fc401da --- /dev/null +++ b/components/util/non_geckolib.rs @@ -0,0 +1,171 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +///! Miscellaneous Code which depends on large libraries that we don't +/// depend on in GeckoLib builds. + +use azure::azure_hl::Color; +use html5ever::tree_builder::QuirksMode; +use hyper::header::ContentType; +use hyper::http::RawStatus; +use hyper::method::Method; +use hyper::mime::{Attr, Mime, SubLevel, TopLevel, Value}; +use js::conversions::{FromJSValConvertible, ToJSValConvertible, latin1_to_string}; +use js::jsapi::{JSContext, JSString, HandleValue, Heap, MutableHandleValue}; +use js::jsapi::{JS_GetTwoByteStringCharsAndLength, JS_StringHasLatin1Chars}; +use js::jsval::JSVal; +use js::rust::{GCMethods, ToString}; +use layers::geometry::DevicePixel; +use mem::HeapSizeOf; +use opts; +use std::char; +use std::ptr; +use std::slice; +use str::DOMString; + +/// Behavior for stringification of `JSVal`s. +#[derive(PartialEq)] +pub enum StringificationBehavior { + /// Convert `null` to the string `"null"`. + Default, + /// Convert `null` to the empty string. + Empty, +} + +// https://heycam.github.io/webidl/#es-DOMString +impl ToJSValConvertible for DOMString { + unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { + (**self).to_jsval(cx, rval); + } +} + +// https://heycam.github.io/webidl/#es-DOMString +impl FromJSValConvertible for DOMString { + type Config = StringificationBehavior; + unsafe fn from_jsval(cx: *mut JSContext, + value: HandleValue, + null_behavior: StringificationBehavior) + -> Result<DOMString, ()> { + if null_behavior == StringificationBehavior::Empty && + value.get().is_null() { + Ok(DOMString::new()) + } else { + let jsstr = ToString(cx, value); + if jsstr.is_null() { + debug!("ToString failed"); + Err(()) + } else { + Ok(jsstring_to_str(cx, jsstr)) + } + } + } +} + +/// Convert the given `JSString` to a `DOMString`. Fails if the string does not +/// contain valid UTF-16. +pub unsafe fn jsstring_to_str(cx: *mut JSContext, s: *mut JSString) -> DOMString { + let latin1 = JS_StringHasLatin1Chars(s); + DOMString::from_string(if latin1 { + latin1_to_string(cx, s) + } else { + let mut length = 0; + let chars = JS_GetTwoByteStringCharsAndLength(cx, ptr::null(), s, &mut length); + assert!(!chars.is_null()); + let potentially_ill_formed_utf16 = slice::from_raw_parts(chars, length as usize); + let mut s = String::with_capacity(length as usize); + for item in char::decode_utf16(potentially_ill_formed_utf16.iter().cloned()) { + match item { + Ok(c) => s.push(c), + Err(_) => { + // FIXME: Add more info like document URL in the message? + macro_rules! message { + () => { + "Found an unpaired surrogate in a DOM string. \ + If you see this in real web content, \ + please comment on https://github.com/servo/servo/issues/6564" + } + } + if opts::get().replace_surrogates { + error!(message!()); + s.push('\u{FFFD}'); + } else { + panic!(concat!(message!(), " Use `-Z replace-surrogates` \ + on the command line to make this non-fatal.")); + } + } + } + } + s + }) +} + +// This is measured properly by the heap measurement implemented in SpiderMonkey. +impl<T: Copy + GCMethods<T>> HeapSizeOf for Heap<T> { + fn heap_size_of_children(&self) -> usize { + 0 + } +} + +impl HeapSizeOf for ContentType { + fn heap_size_of_children(&self) -> usize { + let &ContentType(ref mime) = self; + mime.heap_size_of_children() + } +} + +impl HeapSizeOf for Method { + fn heap_size_of_children(&self) -> usize { + match *self { + Method::Extension(ref str) => str.heap_size_of_children(), + _ => 0 + } + } +} + +impl HeapSizeOf for Mime { + fn heap_size_of_children(&self) -> usize { + let &Mime(ref top_level, ref sub_level, ref vec) = self; + top_level.heap_size_of_children() + sub_level.heap_size_of_children() + + vec.heap_size_of_children() + } +} + +impl HeapSizeOf for TopLevel { + fn heap_size_of_children(&self) -> usize { + match *self { + TopLevel::Ext(ref str) => str.heap_size_of_children(), + _ => 0 + } + } +} + +impl HeapSizeOf for SubLevel { + fn heap_size_of_children(&self) -> usize { + match *self { + SubLevel::Ext(ref str) => str.heap_size_of_children(), + _ => 0 + } + } +} + +impl HeapSizeOf for Attr { + fn heap_size_of_children(&self) -> usize { + match *self { + Attr::Ext(ref str) => str.heap_size_of_children(), + _ => 0 + } + } +} + +impl HeapSizeOf for Value { + fn heap_size_of_children(&self) -> usize { + match *self { + Value::Ext(ref str) => str.heap_size_of_children(), + _ => 0 + } + } +} + + +known_heap_size!(0, Color, DevicePixel, JSVal, QuirksMode, RawStatus); diff --git a/components/util/str.rs b/components/util/str.rs index fdcdcb8877a..2d068617b46 100644 --- a/components/util/str.rs +++ b/components/util/str.rs @@ -5,23 +5,15 @@ use app_units::Au; use cssparser::{self, Color, RGBA}; use euclid::num::Zero; -use js::conversions::{FromJSValConvertible, ToJSValConvertible, latin1_to_string}; -use js::jsapi::{JSContext, JSString, HandleValue, MutableHandleValue}; -use js::jsapi::{JS_GetTwoByteStringCharsAndLength, JS_StringHasLatin1Chars}; -use js::rust::ToString; use libc::c_char; use num_lib::ToPrimitive; -use opts; use std::ascii::AsciiExt; use std::borrow::ToOwned; -use std::char; use std::convert::AsRef; use std::ffi::CStr; use std::fmt; use std::iter::{Filter, Peekable}; use std::ops::{Deref, DerefMut}; -use std::ptr; -use std::slice; use std::str::{CharIndices, FromStr, Split, from_utf8}; #[derive(Clone, PartialOrd, Ord, PartialEq, Eq, Deserialize, Serialize, Hash, Debug)] @@ -33,6 +25,9 @@ impl DOMString { pub fn new() -> DOMString { DOMString(String::new()) } + pub fn from_string(s: String) -> DOMString { + DOMString(s) + } // FIXME(ajeffrey): implement more of the String methods on DOMString? pub fn push_str(&mut self, string: &str) { self.0.push_str(string) @@ -113,82 +108,6 @@ impl Into<Vec<u8>> for DOMString { } } -// https://heycam.github.io/webidl/#es-DOMString -impl ToJSValConvertible for DOMString { - unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) { - (**self).to_jsval(cx, rval); - } -} - -/// Behavior for stringification of `JSVal`s. -#[derive(PartialEq)] -pub enum StringificationBehavior { - /// Convert `null` to the string `"null"`. - Default, - /// Convert `null` to the empty string. - Empty, -} - -/// Convert the given `JSString` to a `DOMString`. Fails if the string does not -/// contain valid UTF-16. -pub unsafe fn jsstring_to_str(cx: *mut JSContext, s: *mut JSString) -> DOMString { - let latin1 = JS_StringHasLatin1Chars(s); - DOMString(if latin1 { - latin1_to_string(cx, s) - } else { - let mut length = 0; - let chars = JS_GetTwoByteStringCharsAndLength(cx, ptr::null(), s, &mut length); - assert!(!chars.is_null()); - let potentially_ill_formed_utf16 = slice::from_raw_parts(chars, length as usize); - let mut s = String::with_capacity(length as usize); - for item in char::decode_utf16(potentially_ill_formed_utf16.iter().cloned()) { - match item { - Ok(c) => s.push(c), - Err(_) => { - // FIXME: Add more info like document URL in the message? - macro_rules! message { - () => { - "Found an unpaired surrogate in a DOM string. \ - If you see this in real web content, \ - please comment on https://github.com/servo/servo/issues/6564" - } - } - if opts::get().replace_surrogates { - error!(message!()); - s.push('\u{FFFD}'); - } else { - panic!(concat!(message!(), " Use `-Z replace-surrogates` \ - on the command line to make this non-fatal.")); - } - } - } - } - s - }) -} - -// https://heycam.github.io/webidl/#es-DOMString -impl FromJSValConvertible for DOMString { - type Config = StringificationBehavior; - unsafe fn from_jsval(cx: *mut JSContext, - value: HandleValue, - null_behavior: StringificationBehavior) - -> Result<DOMString, ()> { - if null_behavior == StringificationBehavior::Empty && - value.get().is_null() { - Ok(DOMString::new()) - } else { - let jsstr = ToString(cx, value); - if jsstr.is_null() { - debug!("ToString failed"); - Err(()) - } else { - Ok(jsstring_to_str(cx, jsstr)) - } - } - } -} - impl Extend<char> for DOMString { fn extend<I>(&mut self, iterable: I) where I: IntoIterator<Item=char> { self.0.extend(iterable) diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml index 21130f1cef2..6650b3ce3f8 100644 --- a/ports/cef/Cargo.toml +++ b/ports/cef/Cargo.toml @@ -45,6 +45,7 @@ path = "../../components/msg" [dependencies.util] path = "../../components/util" +features = ["non-geckolib"] [dependencies.style] path = "../../components/style" diff --git a/ports/geckolib/Cargo.lock b/ports/geckolib/Cargo.lock index 28b46a337ee..dc494e3be30 100644 --- a/ports/geckolib/Cargo.lock +++ b/ports/geckolib/Cargo.lock @@ -20,11 +20,6 @@ dependencies = [ ] [[package]] -name = "android_glue" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "app_units" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -41,27 +36,6 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "azure" -version = "0.2.1" -source = "git+https://github.com/servo/rust-azure#7662f94f0b8c368134a04edac936328d603c7ad8" -dependencies = [ - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "core-text 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)", - "heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "heapsize_plugin 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_macros 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-skia 0.20130412.3 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "bincode" version = "0.4.0" source = "git+https://github.com/TyOverby/bincode#590a862b4368910a5285ca8e970163f21a752b8d" @@ -83,74 +57,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "cgl" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "gleam 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "cocoa" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "cookie" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "openssl 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "core-foundation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "core-foundation-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "core-foundation-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "core-graphics" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "core-text" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "cssparser" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -162,11 +68,6 @@ dependencies = [ ] [[package]] -name = "debug-builders" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "debug_unreachable" version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -175,31 +76,6 @@ dependencies = [ ] [[package]] -name = "dlib" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "dwmapi-sys" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "dylib" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "encoding" version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -272,96 +148,16 @@ dependencies = [ ] [[package]] -name = "expat-sys" -version = "2.1.1-really.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "make-cmd 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "fnv" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "freetype" -version = "0.1.0" -source = "git+https://github.com/servo/rust-freetype#d564ff90a3c69d987f5c015d7ec034cfaee21aff" -dependencies = [ - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "futf" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "debug_unreachable 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gcc" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gdi32-sys" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "getopts" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "gl_common" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gl_generator" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "xml-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gleam" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "glx" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "heapsize" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -375,68 +171,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "hpack" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "html5ever" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", - "rc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "httparse" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "hyper" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cookie 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "httparse 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "language-tags 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", - "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "io-surface" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cgl 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "ipc-channel" version = "0.1.0" source = "git+https://github.com/servo/ipc-channel#1b95d5490d7b7f49576577315bdb5b4c834d08d0" @@ -452,19 +186,6 @@ dependencies = [ ] [[package]] -name = "js" -version = "0.1.1" -source = "git+https://github.com/servo/rust-mozjs#07523d8b3dd12276eb94a266e83c0b1d77aa4160" -dependencies = [ - "heapsize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "mozjs_sys 0.0.0 (git+https://github.com/servo/mozjs)", - "num 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "kernel32-sys" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -474,69 +195,16 @@ dependencies = [ ] [[package]] -name = "khronos_api" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "language-tags" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "layers" -version = "0.2.0" -source = "git+https://github.com/servo/rust-layers#79903a0b38c9684f5f74622532023d4ac51b4f7f" -dependencies = [ - "azure 0.2.1 (git+https://github.com/servo/rust-azure)", - "cgl 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "io-surface 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-skia 0.20130412.3 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "lazy_static" version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "libc" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "libressl-pnacl-sys" -version = "2.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "pnacl-build-helper 1.4.10 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "libz-sys" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "gcc 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "log" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -545,55 +213,11 @@ dependencies = [ ] [[package]] -name = "mac" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "make-cmd" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "matches" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "mime" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "mmap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "mozjs_sys" -version = "0.0.0" -source = "git+https://github.com/servo/mozjs#e89e72f1d69b6a90a7b691fec2e4624e6a375824" -dependencies = [ - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libz-sys 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "num" version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -613,74 +237,6 @@ dependencies = [ ] [[package]] -name = "objc" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "openssl" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys-extras 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "openssl-sys" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libressl-pnacl-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "openssl-sys-extras" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "gcc 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "osmesa-sys" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "shared_library 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "phf" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "debug-builders 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "phf_codegen" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "phf_generator 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "phf_generator" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -695,11 +251,6 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "pkg-config" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "plugins" version = "0.0.1" dependencies = [ @@ -708,14 +259,6 @@ dependencies = [ ] [[package]] -name = "pnacl-build-helper" -version = "1.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "quasi" version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -756,11 +299,6 @@ dependencies = [ ] [[package]] -name = "rc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "rustc-serialize" version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -806,123 +344,11 @@ dependencies = [ ] [[package]] -name = "servo-egl" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "servo-fontconfig" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-fontconfig-sys 2.11.2-really.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "servo-fontconfig-sys" -version = "2.11.2-really.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "expat-sys 2.1.1-really.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "servo-freetype-sys" -version = "2.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "servo-glutin" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cgl 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdi32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_common 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gl_generator 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "khronos_api 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "objc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "osmesa-sys 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "shared_library 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "user32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-kbd 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-window 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "x11-dl 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "servo-skia" -version = "0.20130412.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cgl 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "expat-sys 2.1.1-really.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gleam 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "io-surface 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-egl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-freetype-sys 2.4.11 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "x11 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "shared_library" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "shell32-sys" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "smallvec" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "solicit" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "hpack 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "string_cache" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -980,40 +406,11 @@ dependencies = [ ] [[package]] -name = "tempdir" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "tempfile" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "tenacious" version = "0.0.15" source = "git+https://github.com/Manishearth/rust-tenacious#3eaa89911cf32b09b869fcc4e998be535e4f8c8d" [[package]] -name = "tendril" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", - "futf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "time" version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1024,21 +421,6 @@ dependencies = [ ] [[package]] -name = "traitobject" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "typeable" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "unicase" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "unreachable" version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1058,29 +440,15 @@ dependencies = [ ] [[package]] -name = "user32-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "util" version = "0.0.1" dependencies = [ "app_units 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.2.1 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.1.0 (git+https://github.com/servo/ipc-channel)", - "js 0.1.1 (git+https://github.com/servo/rust-mozjs)", - "layers 0.2.0 (git+https://github.com/servo/rust-layers)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1113,39 +481,6 @@ version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "wayland-client" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "dlib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "wayland-kbd" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "dlib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "mmap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "wayland-window" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wayland-client 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "winapi" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1155,29 +490,3 @@ name = "winapi-build" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "x11" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "x11-dl" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "dylib 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "xml-rs" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - diff --git a/ports/gonk/Cargo.toml b/ports/gonk/Cargo.toml index 645cf9b480a..6e6eac6cf97 100644 --- a/ports/gonk/Cargo.toml +++ b/ports/gonk/Cargo.toml @@ -39,6 +39,7 @@ path = "../../components/profile" [dependencies.util] path = "../../components/util" +features = ["non-geckolib"] [dependencies] env_logger = "0.3" |