Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade rust to f93ab64d4a1a7ee91759a1594ab2a426b6cc657e/rustc-1.5.0-dev.

Browse source
This commit is contained in:
Manish Goregaokar 2015-09-21 13:12:01 +05:30 • committed by Ms2ger
parent 8f1469eb08
commit 3c969b346a
40 changed files with 253 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/canvas_traits/Cargo.toml
View file

@ -23,7 +23,7 @@ git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
git = "https://github.com/pcwalton/ipc-channel" git = "https://github.com/pcwalton/ipc-channel"
[dependencies.serde] [dependencies.serde]
version = "0.5" version = "0.6"
features = [ "nightly" ] features = [ "nightly" ]
[dependencies.cssparser] [dependencies.cssparser]

2
components/devtools/Cargo.toml
View file

@ -34,6 +34,6 @@ features = [ "serde_serialization" ]
log = "0.3" log = "0.3"
time = "0.1" time = "0.1"
rustc-serialize = "0.3" rustc-serialize = "0.3"
serde = "0.5" serde = "0.6"
serde_macros = "0.5" serde_macros = "0.5"

2
components/devtools_traits/Cargo.toml
View file

@ -31,6 +31,6 @@ path = "../plugins"
time = "0.1" time = "0.1"
rustc-serialize = "0.3" rustc-serialize = "0.3"
bitflags = "0.3" bitflags = "0.3"
serde = "0.5" serde = "0.6"
serde_macros = "0.5" serde_macros = "0.5"

2
components/gfx/Cargo.toml
View file

@ -18,7 +18,7 @@ libc = "0.1"
log = "0.3" log = "0.3"
rand = "0.3" rand = "0.3"
rustc-serialize = "0.3" rustc-serialize = "0.3"
serde = "0.5" serde = "0.6"
serde_macros = "0.5" serde_macros = "0.5"
smallvec = "0.1" smallvec = "0.1"
string_cache = "0.1" string_cache = "0.1"

4
components/gfx/lib.rs
View file

@ -2,8 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(arc_weak)] #![feature(alloc)]
#![feature(box_raw)]
#![feature(box_syntax)] #![feature(box_syntax)]
// For simd (currently x86_64/aarch64) // For simd (currently x86_64/aarch64)
@ -26,6 +25,7 @@
extern crate log; extern crate log;
extern crate serde; extern crate serde;
extern crate alloc;
extern crate azure; extern crate azure;
#[macro_use] extern crate bitflags; #[macro_use] extern crate bitflags;
extern crate fnv; extern crate fnv;

2
components/gfx/platform/freetype/font_context.rs
View file

@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use alloc::heap;
use freetype::freetype::FTErrorMethods; use freetype::freetype::FTErrorMethods;
use freetype::freetype::FT_Add_Default_Modules; use freetype::freetype::FT_Add_Default_Modules;
use freetype::freetype::FT_Done_Library; use freetype::freetype::FT_Done_Library;
@ -12,7 +13,6 @@ use freetype::freetype::struct_FT_MemoryRec_;
use libc::{c_void, c_long}; use libc::{c_void, c_long};
use std::ptr; use std::ptr;
use std::rc::Rc; use std::rc::Rc;
use std::rt::heap;
use util::mem::{HeapSizeOf, heap_size_of}; use util::mem::{HeapSizeOf, heap_size_of};
// We pass a |User| struct -- via an opaque |void*| -- to FreeType each time a new instance is // We pass a |User| struct -- via an opaque |void*| -- to FreeType each time a new instance is

2
components/layout/Cargo.toml
View file

@ -77,7 +77,7 @@ smallvec = "0.1"
string_cache = "0.1" string_cache = "0.1"
string_cache_plugin = "0.1" string_cache_plugin = "0.1"
euclid = "0.2" euclid = "0.2"
serde = "0.5" serde = "0.6"
serde_macros = "0.5" serde_macros = "0.5"
serde_json = "0.5" serde_json = "0.5"
unicode-bidi = "0.2" unicode-bidi = "0.2"

4
components/layout/lib.rs
View file

@ -2,10 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(append)]
#![feature(arc_unique)]
#![feature(arc_weak)]
#![feature(box_str)]
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(cell_extras)] #![feature(cell_extras)]
#![feature(custom_derive)] #![feature(custom_derive)]

2
components/layout_traits/Cargo.toml
View file

@ -34,6 +34,6 @@ features = [ "serde_serialization" ]
[dependencies] [dependencies]
euclid = "0.2" euclid = "0.2"
serde = "0.5" serde = "0.6"
serde_macros = "0.5" serde_macros = "0.5"

2
components/msg/Cargo.toml
View file

@ -48,7 +48,7 @@ path = "../plugins"
bitflags = "0.3" bitflags = "0.3"
rustc-serialize = "0.3.4" rustc-serialize = "0.3.4"
euclid = "0.2" euclid = "0.2"
serde = "0.5" serde = "0.6"
serde_macros = "0.5" serde_macros = "0.5"
[target.x86_64-apple-darwin.dependencies] [target.x86_64-apple-darwin.dependencies]

2
components/net_traits/Cargo.toml
View file

@ -39,5 +39,5 @@ log = "0.3"
euclid = "0.2" euclid = "0.2"
regex = "0.1.33" regex = "0.1.33"
regex_macros = "0.1.19" regex_macros = "0.1.19"
serde = "0.5" serde = "0.6"
serde_macros = "0.5" serde_macros = "0.5"

1
components/net_traits/lib.rs
View file

@ -4,7 +4,6 @@
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(custom_derive)] #![feature(custom_derive)]
#![feature(box_raw)]
#![feature(plugin)] #![feature(plugin)]
#![feature(slice_patterns)] #![feature(slice_patterns)]
#![feature(step_by)] #![feature(step_by)]

2
components/plugins/Cargo.toml
View file

@ -9,7 +9,7 @@ path = "lib.rs"
plugin = true plugin = true
[dependencies.tenacious] [dependencies.tenacious]
git = "https://github.com/servo/rust-tenacious" git = "https://github.com/Manishearth/rust-tenacious"
[dependencies.clippy] [dependencies.clippy]
git = "https://github.com/Manishearth/rust-clippy" git = "https://github.com/Manishearth/rust-clippy"

17
components/plugins/lib.rs
View file

@ -20,11 +20,12 @@ extern crate syntax;
#[macro_use] #[macro_use]
extern crate rustc; extern crate rustc;
extern crate rustc_front;
extern crate tenacious; extern crate tenacious;
#[cfg(feature = "clippy")] #[cfg(feature = "clippy")]
extern crate clippy; extern crate clippy;
use rustc::lint::LintPassObject;
use rustc::plugin::Registry; use rustc::plugin::Registry;
use syntax::ext::base::*; use syntax::ext::base::*;
use syntax::feature_gate::AttributeType::Whitelisted; use syntax::feature_gate::AttributeType::Whitelisted;
@ -50,12 +51,12 @@ pub fn plugin_registrar(reg: &mut Registry) {
reg.register_syntax_extension(intern("derive_HeapSizeOf"), MultiDecorator(box heap_size::expand_heap_size)); reg.register_syntax_extension(intern("derive_HeapSizeOf"), MultiDecorator(box heap_size::expand_heap_size));
reg.register_macro("to_lower", casing::expand_lower); reg.register_macro("to_lower", casing::expand_lower);
reg.register_macro("to_upper", casing::expand_upper); reg.register_macro("to_upper", casing::expand_upper);
reg.register_lint_pass(box lints::transmute_type::TransmutePass as LintPassObject); reg.register_late_lint_pass(box lints::transmute_type::TransmutePass);
reg.register_lint_pass(box lints::unrooted_must_root::UnrootedPass::new() as LintPassObject); reg.register_late_lint_pass(box lints::unrooted_must_root::UnrootedPass::new());
reg.register_lint_pass(box lints::privatize::PrivatizePass as LintPassObject); reg.register_late_lint_pass(box lints::privatize::PrivatizePass);
reg.register_lint_pass(box lints::inheritance_integrity::InheritancePass as LintPassObject); reg.register_late_lint_pass(box lints::inheritance_integrity::InheritancePass);
reg.register_lint_pass(box lints::ban::BanPass as LintPassObject); reg.register_early_lint_pass(box lints::ban::BanPass);
reg.register_lint_pass(box tenacious::TenaciousPass as LintPassObject); reg.register_late_lint_pass(box tenacious::TenaciousPass);
reg.register_attribute("must_root".to_string(), Whitelisted); reg.register_attribute("must_root".to_string(), Whitelisted);
reg.register_attribute("servo_lang".to_string(), Whitelisted); reg.register_attribute("servo_lang".to_string(), Whitelisted);
reg.register_attribute("allow_unrooted_interior".to_string(), Whitelisted); reg.register_attribute("allow_unrooted_interior".to_string(), Whitelisted);
@ -68,5 +69,5 @@ fn register_clippy(reg: &mut Registry) {
} }
#[cfg(not(feature = "clippy"))] #[cfg(not(feature = "clippy"))]
fn register_clippy(reg: &mut Registry) { fn register_clippy(reg: &mut Registry) {
reg.register_lint_pass(box lints::str_to_string::StrToStringPass as LintPassObject); reg.register_late_lint_pass(box lints::str_to_string::StrToStringPass);
} }

8
components/plugins/lints/ban.rs
View file

@ -2,8 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use rustc::lint::{Context, LintPass, LintArray}; use rustc::lint::{EarlyContext, LintPass, LintArray, EarlyLintPass, LintContext};
use syntax::ast; use syntax::ast::Ty;
use utils::match_ty_unwrap; use utils::match_ty_unwrap;
declare_lint!(BANNED_TYPE, Deny, declare_lint!(BANNED_TYPE, Deny,
@ -21,8 +21,10 @@ impl LintPass for BanPass {
fn get_lints(&self) -> LintArray { fn get_lints(&self) -> LintArray {
lint_array!(BANNED_TYPE) lint_array!(BANNED_TYPE)
} }
}
fn check_ty(&mut self, cx: &Context, ty: &ast::Ty) { impl EarlyLintPass for BanPass {
fn check_ty(&mut self, cx: &EarlyContext, ty: &Ty) {
if match_ty_unwrap(ty, &["std", "cell", "Cell"]) if match_ty_unwrap(ty, &["std", "cell", "Cell"])
.and_then(|t| t.get(0)) .and_then(|t| t.get(0))
.and_then(|t| match_ty_unwrap(&**t, &["dom", "bindings", "js", "JS"])) .and_then(|t| match_ty_unwrap(&**t, &["dom", "bindings", "js", "JS"]))

11
components/plugins/lints/inheritance_integrity.rs
View file

@ -2,9 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use rustc::lint::{Context, LintPass, LintArray, Level}; use rustc::lint::{LateContext, LintPass, LintArray, Level, LateLintPass, LintContext};
use rustc::middle::def; use rustc::middle::def;
use rustc::middle::def_id::DefId; use rustc::middle::def_id::DefId;
use rustc_front::hir;
use syntax::ast; use syntax::ast;
use utils::match_lang_ty; use utils::match_lang_ty;
@ -21,9 +22,11 @@ impl LintPass for InheritancePass {
fn get_lints(&self) -> LintArray { fn get_lints(&self) -> LintArray {
lint_array!(INHERITANCE_INTEGRITY) lint_array!(INHERITANCE_INTEGRITY)
} }
}
fn check_struct_def(&mut self, cx: &Context, def: &ast::StructDef, _i: ast::Ident, impl LateLintPass for InheritancePass {
_gen: &ast::Generics, id: ast::NodeId) { fn check_struct_def(&mut self, cx: &LateContext, def: &hir::StructDef, _i: ast::Ident,
_gen: &hir::Generics, id: ast::NodeId) {
// Lints are run post expansion, so it's fine to use // Lints are run post expansion, so it's fine to use
// #[_dom_struct_marker] here without also checking for #[dom_struct] // #[_dom_struct_marker] here without also checking for #[dom_struct]
if cx.tcx.has_attr(DefId::local(id), "_dom_struct_marker") { if cx.tcx.has_attr(DefId::local(id), "_dom_struct_marker") {
@ -43,7 +46,7 @@ impl LintPass for InheritancePass {
.map(|(_, f)| f.span); .map(|(_, f)| f.span);
// Find all #[dom_struct] fields // Find all #[dom_struct] fields
let dom_spans: Vec<_> = def.fields.iter().enumerate().filter_map(|(ctr, f)| { let dom_spans: Vec<_> = def.fields.iter().enumerate().filter_map(|(ctr, f)| {
if let ast::TyPath(..) = f.node.ty.node { if let hir::TyPath(..) = f.node.ty.node {
if let Some(&def::PathResolution { base_def: def::DefTy(def_id, _), .. }) = if let Some(&def::PathResolution { base_def: def::DefTy(def_id, _), .. }) =
cx.tcx.def_map.borrow().get(&f.node.ty.id) { cx.tcx.def_map.borrow().get(&f.node.ty.id) {
if cx.tcx.has_attr(def_id, "_dom_struct_marker") { if cx.tcx.has_attr(def_id, "_dom_struct_marker") {

14
components/plugins/lints/privatize.rs
View file

@ -2,10 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use rustc::lint::{Context, LintPass, LintArray}; use rustc::lint::{LateContext, LintPass, LintArray, LateLintPass, LintContext};
use rustc::middle::def_id::DefId; use rustc::middle::def_id::DefId;
use rustc_front::hir;
use syntax::ast; use syntax::ast;
use syntax::ast::Public;
use syntax::attr::AttrMetaMethods; use syntax::attr::AttrMetaMethods;
declare_lint!(PRIVATIZE, Deny, declare_lint!(PRIVATIZE, Deny,
@ -21,17 +21,19 @@ impl LintPass for PrivatizePass {
fn get_lints(&self) -> LintArray { fn get_lints(&self) -> LintArray {
lint_array!(PRIVATIZE) lint_array!(PRIVATIZE)
} }
}
impl LateLintPass for PrivatizePass {
fn check_struct_def(&mut self, fn check_struct_def(&mut self,
cx: &Context, cx: &LateContext,
def: &ast::StructDef, def: &hir::StructDef,
_i: ast::Ident, _i: ast::Ident,
_gen: &ast::Generics, _gen: &hir::Generics,
id: ast::NodeId) { id: ast::NodeId) {
if cx.tcx.has_attr(DefId::local(id), "privatize") { if cx.tcx.has_attr(DefId::local(id), "privatize") {
for field in &def.fields { for field in &def.fields {
match field.node { match field.node {
ast::StructField_ { kind: ast::NamedField(ident, visibility), .. } if visibility == Public => { hir::StructField_ { kind: hir::NamedField(ident, visibility), .. } if visibility == hir::Public => {
cx.span_lint(PRIVATIZE, field.span, cx.span_lint(PRIVATIZE, field.span,
&format!("Field {} is public where only private fields are allowed", &format!("Field {} is public where only private fields are allowed",
ident.name)); ident.name));

12
components/plugins/lints/str_to_string.rs
View file

@ -2,9 +2,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use rustc::lint::{Context, LintPass, LintArray}; use rustc::lint::{LateContext, LintPass, LintArray, LateLintPass, LintContext};
use rustc::middle::ty; use rustc::middle::ty;
use syntax::ast; use rustc_front::hir;
declare_lint!(STR_TO_STRING, Deny, declare_lint!(STR_TO_STRING, Deny,
"Warn when a String could use to_owned() instead of to_string()"); "Warn when a String could use to_owned() instead of to_string()");
@ -18,10 +18,12 @@ impl LintPass for StrToStringPass {
fn get_lints(&self) -> LintArray { fn get_lints(&self) -> LintArray {
lint_array!(STR_TO_STRING) lint_array!(STR_TO_STRING)
} }
}
fn check_expr(&mut self, cx: &Context, expr: &ast::Expr) { impl LateLintPass for StrToStringPass {
fn check_expr(&mut self, cx: &LateContext, expr: &hir::Expr) {
match expr.node { match expr.node {
ast::ExprMethodCall(ref method, _, ref args) hir::ExprMethodCall(ref method, _, ref args)
if method.node.name.as_str() == "to_string" if method.node.name.as_str() == "to_string"
&& is_str(cx, &*args[0]) => { && is_str(cx, &*args[0]) => {
cx.span_lint(STR_TO_STRING, expr.span, cx.span_lint(STR_TO_STRING, expr.span,
@ -30,7 +32,7 @@ impl LintPass for StrToStringPass {
_ => () _ => ()
} }
fn is_str(cx: &Context, expr: &ast::Expr) -> bool { fn is_str(cx: &LateContext, expr: &hir::Expr) -> bool {
fn walk_ty<'t>(ty: ty::Ty<'t>) -> ty::Ty<'t> { fn walk_ty<'t>(ty: ty::Ty<'t>) -> ty::Ty<'t> {
match ty.sty { match ty.sty {
ty::TyRef(_, ref tm) | ty::TyRawPtr(ref tm) => walk_ty(tm.ty), ty::TyRef(_, ref tm) | ty::TyRawPtr(ref tm) => walk_ty(tm.ty),

12
components/plugins/lints/transmute_type.rs
View file

@ -2,8 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use rustc::lint::{Context, LintPass, LintArray}; use rustc::lint::{LateContext, LintPass, LintArray, LateLintPass, LintContext};
use syntax::ast; use rustc_front::hir;
use syntax::attr::AttrMetaMethods; use syntax::attr::AttrMetaMethods;
declare_lint!(TRANSMUTE_TYPE_LINT, Allow, declare_lint!(TRANSMUTE_TYPE_LINT, Allow,
@ -19,12 +19,14 @@ impl LintPass for TransmutePass {
fn get_lints(&self) -> LintArray { fn get_lints(&self) -> LintArray {
lint_array!(TRANSMUTE_TYPE_LINT) lint_array!(TRANSMUTE_TYPE_LINT)
} }
}
fn check_expr(&mut self, cx: &Context, ex: &ast::Expr) { impl LateLintPass for TransmutePass {
fn check_expr(&mut self, cx: &LateContext, ex: &hir::Expr) {
match ex.node { match ex.node {
ast::ExprCall(ref expr, ref args) => { hir::ExprCall(ref expr, ref args) => {
match expr.node { match expr.node {
ast::ExprPath(_, ref path) => { hir::ExprPath(_, ref path) => {
if path.segments.last() if path.segments.last()
.map_or(false, |ref segment| segment.identifier.name.as_str() == "transmute") .map_or(false, |ref segment| segment.identifier.name.as_str() == "transmute")
&& args.len() == 1 { && args.len() == 1 {

59
components/plugins/lints/unrooted_must_root.rs
View file

@ -2,12 +2,13 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use rustc::ast_map; use rustc::front::map as ast_map;
use rustc::lint::{Context, LintPass, LintArray}; use rustc::lint::{LateContext, LintPass, LintArray, LateLintPass, LintContext};
use rustc::middle::astconv_util::ast_ty_to_prim_ty; use rustc::middle::astconv_util::ast_ty_to_prim_ty;
use rustc::middle::ty; use rustc::middle::ty;
use rustc_front::{hir, visit};
use syntax::attr::AttrMetaMethods; use syntax::attr::AttrMetaMethods;
use syntax::{ast, codemap, visit}; use syntax::{ast, codemap};
use utils::{match_def_path, unsafe_context}; use utils::{match_def_path, unsafe_context};
declare_lint!(UNROOTED_MUST_ROOT, Deny, declare_lint!(UNROOTED_MUST_ROOT, Deny,
@ -43,7 +44,7 @@ impl UnrootedPass {
} }
/// Checks if a type is unrooted or contains any owned unrooted types /// Checks if a type is unrooted or contains any owned unrooted types
fn is_unrooted_ty(cx: &Context, ty: &ty::TyS, in_new_function: bool) -> bool { fn is_unrooted_ty(cx: &LateContext, ty: &ty::TyS, in_new_function: bool) -> bool {
let mut ret = false; let mut ret = false;
ty.maybe_walk(|t| { ty.maybe_walk(|t| {
match t.sty { match t.sty {
@ -76,12 +77,15 @@ impl LintPass for UnrootedPass {
fn get_lints(&self) -> LintArray { fn get_lints(&self) -> LintArray {
lint_array!(UNROOTED_MUST_ROOT) lint_array!(UNROOTED_MUST_ROOT)
} }
}
impl LateLintPass for UnrootedPass {
/// All structs containing #[must_root] types must be #[must_root] themselves /// All structs containing #[must_root] types must be #[must_root] themselves
fn check_struct_def(&mut self, fn check_struct_def(&mut self,
cx: &Context, cx: &LateContext,
def: &ast::StructDef, def: &hir::StructDef,
_i: ast::Ident, _i: ast::Ident,
_gen: &ast::Generics, _gen: &hir::Generics,
id: ast::NodeId) { id: ast::NodeId) {
let item = match cx.tcx.map.get(id) { let item = match cx.tcx.map.get(id) {
ast_map::Node::NodeItem(item) => item, ast_map::Node::NodeItem(item) => item,
@ -97,11 +101,11 @@ impl LintPass for UnrootedPass {
} }
} }
/// All enums containing #[must_root] types must be #[must_root] themselves /// All enums containing #[must_root] types must be #[must_root] themselves
fn check_variant(&mut self, cx: &Context, var: &ast::Variant, _gen: &ast::Generics) { fn check_variant(&mut self, cx: &LateContext, var: &hir::Variant, _gen: &hir::Generics) {
let ref map = cx.tcx.map; let ref map = cx.tcx.map;
if map.expect_item(map.get_parent(var.node.id)).attrs.iter().all(|a| !a.check_name("must_root")) { if map.expect_item(map.get_parent(var.node.id)).attrs.iter().all(|a| !a.check_name("must_root")) {
match var.node.kind { match var.node.kind {
ast::TupleVariantKind(ref vec) => { hir::TupleVariantKind(ref vec) => {
for ty in vec { for ty in vec {
ast_ty_to_prim_ty(cx.tcx, &*ty.ty).map(|t| { ast_ty_to_prim_ty(cx.tcx, &*ty.ty).map(|t| {
if is_unrooted_ty(cx, t, false) { if is_unrooted_ty(cx, t, false) {
@ -117,8 +121,8 @@ impl LintPass for UnrootedPass {
} }
} }
/// Function arguments that are #[must_root] types are not allowed /// Function arguments that are #[must_root] types are not allowed
fn check_fn(&mut self, cx: &Context, kind: visit::FnKind, decl: &ast::FnDecl, fn check_fn(&mut self, cx: &LateContext, kind: visit::FnKind, decl: &hir::FnDecl,
block: &ast::Block, _span: codemap::Span, id: ast::NodeId) { block: &hir::Block, _span: codemap::Span, id: ast::NodeId) {
match kind { match kind {
visit::FnKind::ItemFn(i, _, _, _, _, _) | visit::FnKind::ItemFn(i, _, _, _, _, _) |
visit::FnKind::Method(i, _, _) if i.name.as_str() == "new" visit::FnKind::Method(i, _, _) if i.name.as_str() == "new"
@ -128,7 +132,7 @@ impl LintPass for UnrootedPass {
return; return;
}, },
visit::FnKind::ItemFn(_, _, style, _, _, _) => match style { visit::FnKind::ItemFn(_, _, style, _, _, _) => match style {
ast::Unsafety::Unsafe => return, hir::Unsafety::Unsafe => return,
_ => () _ => ()
}, },
_ => () _ => ()
@ -140,7 +144,7 @@ impl LintPass for UnrootedPass {
} }
match block.rules { match block.rules {
ast::DefaultBlock => { hir::DefaultBlock => {
for arg in &decl.inputs { for arg in &decl.inputs {
ast_ty_to_prim_ty(cx.tcx, &*arg.ty).map(|t| { ast_ty_to_prim_ty(cx.tcx, &*arg.ty).map(|t| {
if is_unrooted_ty(cx, t, false) { if is_unrooted_ty(cx, t, false) {
@ -154,8 +158,8 @@ impl LintPass for UnrootedPass {
} }
/// Trait casts from #[must_root] types are not allowed /// Trait casts from #[must_root] types are not allowed
fn check_expr(&mut self, cx: &Context, expr: &ast::Expr) { fn check_expr(&mut self, cx: &LateContext, expr: &hir::Expr) {
fn require_rooted(cx: &Context, in_new_function: bool, subexpr: &ast::Expr) { fn require_rooted(cx: &LateContext, in_new_function: bool, subexpr: &hir::Expr) {
let ty = cx.tcx.expr_ty(&*subexpr); let ty = cx.tcx.expr_ty(&*subexpr);
if is_unrooted_ty(cx, ty, in_new_function) { if is_unrooted_ty(cx, ty, in_new_function) {
cx.span_lint(UNROOTED_MUST_ROOT, cx.span_lint(UNROOTED_MUST_ROOT,
@ -165,7 +169,7 @@ impl LintPass for UnrootedPass {
}; };
match expr.node { match expr.node {
ast::ExprCast(ref subexpr, _) => require_rooted(cx, self.in_new_function, &*subexpr), hir::ExprCast(ref subexpr, _) => require_rooted(cx, self.in_new_function, &*subexpr),
_ => { _ => {
// TODO(pcwalton): Check generics with a whitelist of allowed generics. // TODO(pcwalton): Check generics with a whitelist of allowed generics.
} }
@ -176,11 +180,11 @@ impl LintPass for UnrootedPass {
// Catches `let` statements and assignments which store a #[must_root] value // Catches `let` statements and assignments which store a #[must_root] value
// Expressions which return out of blocks eventually end up in a `let` or assignment // Expressions which return out of blocks eventually end up in a `let` or assignment
// statement or a function return (which will be caught when it is used elsewhere) // statement or a function return (which will be caught when it is used elsewhere)
fn check_stmt(&mut self, cx: &Context, s: &ast::Stmt) { fn check_stmt(&mut self, cx: &LateContext, s: &hir::Stmt) {
match s.node { match s.node {
ast::StmtDecl(_, id) | hir::StmtDecl(_, id) |
ast::StmtExpr(_, id) | hir::StmtExpr(_, id) |
ast::StmtSemi(_, id) if unsafe_context(&cx.tcx.map, id) => { hir::StmtSemi(_, id) if unsafe_context(&cx.tcx.map, id) => {
return return
}, },
_ => () _ => ()
@ -188,26 +192,21 @@ impl LintPass for UnrootedPass {
let expr = match s.node { let expr = match s.node {
// Catch a `let` binding // Catch a `let` binding
ast::StmtDecl(ref decl, _) => match decl.node { hir::StmtDecl(ref decl, _) => match decl.node {
ast::DeclLocal(ref loc) => match loc.init { hir::DeclLocal(ref loc) => match loc.init {
Some(ref e) => &**e, Some(ref e) => &**e,
_ => return _ => return
}, },
_ => return _ => return
}, },
ast::StmtExpr(ref expr, _) => match expr.node { hir::StmtExpr(ref expr, _) => match expr.node {
// This catches deferred `let` statements // This catches deferred `let` statements
ast::ExprAssign(_, ref e) | hir::ExprAssign(_, ref e) |
// Match statements allow you to bind onto the variable later in an arm // Match statements allow you to bind onto the variable later in an arm
// We need not check arms individually since enum/struct fields are already // We need not check arms individually since enum/struct fields are already
// linted in `check_struct_def` and `check_variant` // linted in `check_struct_def` and `check_variant`
// (so there is no way of destructuring out a `#[must_root]` field) // (so there is no way of destructuring out a `#[must_root]` field)
ast::ExprMatch(ref e, _, _) => &**e, hir::ExprMatch(ref e, _, _) => &**e,
// These are able to bind local variables, but are desugared into
// loops and matches pre-lint so should not be encountered
ast::ExprForLoop(..) => unreachable!(),
ast::ExprIfLet(..) => unreachable!(),
ast::ExprWhileLet(..) => unreachable!(),
_ => return _ => return
}, },
_ => return _ => return

28
components/plugins/utils.rs
View file

@ -2,12 +2,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use rustc::ast_map; use rustc::front::map as ast_map;
use rustc::lint::Context; use rustc::lint::LateContext;
use rustc::middle::def; use rustc::middle::def;
use rustc::middle::def_id::DefId; use rustc::middle::def_id::DefId;
use rustc_front::hir;
use syntax::ast; use syntax::ast;
use syntax::ast::{TyPath, Path, AngleBracketedParameters, PathSegment, Ty};
use syntax::attr::mark_used; use syntax::attr::mark_used;
use syntax::ptr::P; use syntax::ptr::P;
@ -15,16 +15,16 @@ use syntax::ptr::P;
/// Matches a type with a provided string, and returns its type parameters if successful /// Matches a type with a provided string, and returns its type parameters if successful
/// ///
/// Try not to use this for types defined in crates you own, use match_lang_ty instead (for lint passes) /// Try not to use this for types defined in crates you own, use match_lang_ty instead (for lint passes)
pub fn match_ty_unwrap<'a>(ty: &'a Ty, segments: &[&str]) -> Option<&'a [P<Ty>]> { pub fn match_ty_unwrap<'a>(ty: &'a ast::Ty, segments: &[&str]) -> Option<&'a [P<ast::Ty>]> {
match ty.node { match ty.node {
TyPath(_, Path { segments: ref seg, .. }) => { ast::TyPath(_, ast::Path { segments: ref seg, .. }) => {
// So ast::Path isn't the full path, just the tokens that were provided. // So hir::Path isn't the full path, just the tokens that were provided.
// I could muck around with the maps and find the full path // I could muck around with the maps and find the full path
// however the more efficient way is to simply reverse the iterators and zip them // however the more efficient way is to simply reverse the iterators and zip them
// which will compare them in reverse until one of them runs out of segments // which will compare them in reverse until one of them runs out of segments
if seg.iter().rev().zip(segments.iter().rev()).all(|(a, b)| a.identifier.name.as_str() == *b) { if seg.iter().rev().zip(segments.iter().rev()).all(|(a, b)| a.identifier.name.as_str() == *b) {
match seg.last() { match seg.last() {
Some(&PathSegment { parameters: AngleBracketedParameters(ref a), .. }) => { Some(&ast::PathSegment { parameters: ast::AngleBracketedParameters(ref a), .. }) => {
Some(&a.types) Some(&a.types)
} }
_ => None _ => None
@ -38,9 +38,9 @@ pub fn match_ty_unwrap<'a>(ty: &'a Ty, segments: &[&str]) -> Option<&'a [P<Ty>]>
} }
/// Checks if a type has a #[servo_lang = "str"] attribute /// Checks if a type has a #[servo_lang = "str"] attribute
pub fn match_lang_ty(cx: &Context, ty: &Ty, value: &str) -> bool { pub fn match_lang_ty(cx: &LateContext, ty: &hir::Ty, value: &str) -> bool {
match ty.node { match ty.node {
TyPath(..) => {}, hir::TyPath(..) => {},
_ => return false, _ => return false,
} }
@ -52,7 +52,7 @@ pub fn match_lang_ty(cx: &Context, ty: &Ty, value: &str) -> bool {
match_lang_did(cx, def_id, value) match_lang_did(cx, def_id, value)
} }
pub fn match_lang_did(cx: &Context, did: DefId, value: &str) -> bool { pub fn match_lang_did(cx: &LateContext, did: DefId, value: &str) -> bool {
cx.tcx.get_attrs(did).iter().any(|attr| { cx.tcx.get_attrs(did).iter().any(|attr| {
match attr.node.value.node { match attr.node.value.node {
ast::MetaNameValue(ref name, ref val) if &**name == "servo_lang" => { ast::MetaNameValue(ref name, ref val) if &**name == "servo_lang" => {
@ -75,14 +75,14 @@ pub fn unsafe_context(map: &ast_map::Map, id: ast::NodeId) -> bool {
match map.find(map.get_parent(id)) { match map.find(map.get_parent(id)) {
Some(ast_map::NodeImplItem(itm)) => { Some(ast_map::NodeImplItem(itm)) => {
match itm.node { match itm.node {
ast::MethodImplItem(ref sig, _) => sig.unsafety == ast::Unsafety::Unsafe, hir::MethodImplItem(ref sig, _) => sig.unsafety == hir::Unsafety::Unsafe,
_ => false _ => false
} }
}, },
Some(ast_map::NodeItem(itm)) => { Some(ast_map::NodeItem(itm)) => {
match itm.node { match itm.node {
ast::ItemFn(_, style, _, _, _, _) => match style { hir::ItemFn(_, style, _, _, _, _) => match style {
ast::Unsafety::Unsafe => true, hir::Unsafety::Unsafe => true,
_ => false, _ => false,
}, },
_ => false, _ => false,
@ -96,7 +96,7 @@ pub fn unsafe_context(map: &ast_map::Map, id: ast::NodeId) -> bool {
/// check if a DefId's path matches the given absolute type path /// check if a DefId's path matches the given absolute type path
/// usage e.g. with /// usage e.g. with
/// `match_def_path(cx, id, &["core", "option", "Option"])` /// `match_def_path(cx, id, &["core", "option", "Option"])`
pub fn match_def_path(cx: &Context, def_id: DefId, path: &[&str]) -> bool { pub fn match_def_path(cx: &LateContext, def_id: DefId, path: &[&str]) -> bool {
cx.tcx.with_path(def_id, |iter| iter.map(|elem| elem.name()) cx.tcx.with_path(def_id, |iter| iter.map(|elem| elem.name())
.zip(path.iter()).all(|(nm, p)| &nm.as_str() == p)) .zip(path.iter()).all(|(nm, p)| &nm.as_str() == p))
} }

2
components/profile_traits/Cargo.toml
View file

@ -27,7 +27,7 @@ version = "0.1.0"
optional = true optional = true
[dependencies] [dependencies]
serde = "0.5" serde = "0.6"
serde_macros = "0.5" serde_macros = "0.5"
time = "0.1.12" time = "0.1.12"

2
components/script/Cargo.toml
View file

@ -89,4 +89,4 @@ string_cache_plugin = "0.1"
euclid = "0.2" euclid = "0.2"
tendril = "0.1.1" tendril = "0.1.1"
rand = "0.3" rand = "0.3"
serde = "0.5" serde = "0.6"

5
components/script/lib.rs
View file

@ -2,13 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(append)]
#![feature(arc_unique)]
#![feature(ascii)] #![feature(ascii)]
#![feature(as_slice)] #![feature(as_slice)]
#![feature(as_unsafe_cell)] #![feature(as_unsafe_cell)]
#![feature(borrow_state)] #![feature(borrow_state)]
#![feature(box_raw)]
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(cell_extras)] #![feature(cell_extras)]
#![feature(core)] #![feature(core)]
@ -24,9 +21,7 @@
#![feature(nonzero)] #![feature(nonzero)]
#![feature(plugin)] #![feature(plugin)]
#![feature(ref_slice)] #![feature(ref_slice)]
#![feature(rc_unique)]
#![feature(slice_patterns)] #![feature(slice_patterns)]
#![feature(str_split_at)]
#![feature(str_utf16)] #![feature(str_utf16)]
#![feature(unicode)] #![feature(unicode)]
#![feature(vec_push_all)] #![feature(vec_push_all)]

2
components/script_traits/Cargo.toml
View file

@ -32,6 +32,6 @@ features = [ "serde_serialization" ]
[dependencies] [dependencies]
libc = "0.1" libc = "0.1"
euclid = "0.2" euclid = "0.2"
serde = "0.5" serde = "0.6"
serde_macros = "0.5" serde_macros = "0.5"

90
components/servo/Cargo.lock generated
View file

@ -73,7 +73,7 @@ dependencies = [
[[package]] [[package]]
name = "aster" name = "aster"
version = "0.4.4" version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -91,7 +91,7 @@ dependencies = [
"heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"skia 0.0.20130412 (git+https://github.com/servo/skia)", "skia 0.0.20130412 (git+https://github.com/servo/skia)",
"x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -105,7 +105,7 @@ dependencies = [
"byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -161,7 +161,7 @@ dependencies = [
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)", "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"plugins 0.0.1", "plugins 0.0.1",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1", "util 0.0.1",
] ]
@ -296,7 +296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -324,7 +324,7 @@ dependencies = [
"msg 0.0.1", "msg 0.0.1",
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -341,7 +341,7 @@ dependencies = [
"msg 0.0.1", "msg 0.0.1",
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -490,7 +490,7 @@ dependencies = [
"num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -606,12 +606,12 @@ dependencies = [
"rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"script_traits 0.0.1", "script_traits 0.0.1",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"simd 0.1.0 (git+https://github.com/huonw/simd)", "simd 0.1.0 (git+https://github.com/huonw/simd)",
"skia 0.0.20130412 (git+https://github.com/servo/skia)", "skia 0.0.20130412 (git+https://github.com/servo/skia)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1", "style 0.0.1",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -793,7 +793,7 @@ dependencies = [
"phf_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rc 0.1.1 (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)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
@ -825,7 +825,7 @@ dependencies = [
"num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"solicit 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -856,7 +856,7 @@ dependencies = [
"lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -938,11 +938,11 @@ dependencies = [
"script 0.0.1", "script 0.0.1",
"script_traits 0.0.1", "script_traits 0.0.1",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1", "style 0.0.1",
"unicode-bidi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -961,7 +961,7 @@ dependencies = [
"net_traits 0.0.1", "net_traits 0.0.1",
"profile_traits 0.0.1", "profile_traits 0.0.1",
"script_traits 0.0.1", "script_traits 0.0.1",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1", "util 0.0.1",
@ -1081,7 +1081,7 @@ dependencies = [
"plugins 0.0.1", "plugins 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)", "png 0.1.0 (git+https://github.com/servo/rust-png)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1", "style_traits 0.0.1",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1140,7 +1140,7 @@ dependencies = [
"png 0.1.0 (git+https://github.com/servo/rust-png)", "png 0.1.0 (git+https://github.com/servo/rust-png)",
"regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
"regex_macros 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "regex_macros 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1206,7 +1206,7 @@ dependencies = [
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1283,7 +1283,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "plugins" name = "plugins"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"tenacious 0.0.9 (git+https://github.com/servo/rust-tenacious)", "tenacious 0.0.10 (git+https://github.com/manishearth/rust-tenacious)",
] ]
[[package]] [[package]]
@ -1302,7 +1302,7 @@ dependencies = [
"gcc 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"png-sys 1.6.16 (git+https://github.com/servo/rust-png)", "png-sys 1.6.16 (git+https://github.com/servo/rust-png)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1336,7 +1336,7 @@ dependencies = [
"energy-monitor 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "energy-monitor 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"energymon 0.1.0 (git+https://github.com/energymon/energymon-rust.git?rev=67f74732ac)", "energymon 0.1.0 (git+https://github.com/energymon/energymon-rust.git?rev=67f74732ac)",
"ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1344,15 +1344,15 @@ dependencies = [
[[package]] [[package]]
name = "quasi" name = "quasi"
version = "0.3.1" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "quasi_codegen" name = "quasi_codegen"
version = "0.3.1" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"aster 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "aster 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1360,7 +1360,7 @@ name = "quasi_macros"
version = "0.3.1" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"quasi_codegen 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_codegen 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1444,9 +1444,9 @@ dependencies = [
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"script_traits 0.0.1", "script_traits 0.0.1",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1", "style 0.0.1",
"tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1477,7 +1477,7 @@ dependencies = [
"msg 0.0.1", "msg 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
"profile_traits 0.0.1", "profile_traits 0.0.1",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1", "util 0.0.1",
@ -1494,13 +1494,13 @@ dependencies = [
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quickersort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "serde" name = "serde"
version = "0.5.3" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1511,8 +1511,8 @@ name = "serde_codegen"
version = "0.5.0" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"aster 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "aster 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "quasi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1522,7 +1522,7 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1598,11 +1598,11 @@ dependencies = [
[[package]] [[package]]
name = "string_cache" name = "string_cache"
version = "0.1.12" version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_shared 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1643,10 +1643,10 @@ dependencies = [
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1", "style_traits 0.0.1",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1660,7 +1660,7 @@ dependencies = [
"cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1", "style 0.0.1",
"style_traits 0.0.1", "style_traits 0.0.1",
@ -1680,7 +1680,7 @@ dependencies = [
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1", "util 0.0.1",
@ -1714,8 +1714,8 @@ dependencies = [
[[package]] [[package]]
name = "tenacious" name = "tenacious"
version = "0.0.9" version = "0.0.10"
source = "git+https://github.com/servo/rust-tenacious#a04fe4a6e6c332f94b491b9369b8e50e94b3c37d" source = "git+https://github.com/manishearth/rust-tenacious#f02b78715ac10ddad67116448ea9697b5a03dfaa"
[[package]] [[package]]
name = "tendril" name = "tendril"
@ -1776,7 +1776,7 @@ dependencies = [
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1811,10 +1811,10 @@ dependencies = [
"rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

2
components/style/Cargo.toml
View file

@ -43,5 +43,5 @@ smallvec = "0.1"
string_cache = "0.1" string_cache = "0.1"
string_cache_plugin = "0.1" string_cache_plugin = "0.1"
euclid = "0.2" euclid = "0.2"
serde = "0.5" serde = "0.6"
serde_macros = "0.5" serde_macros = "0.5"

1
components/style/lib.rs
View file

@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(arc_unique)]
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(box_patterns)] #![feature(box_patterns)]
#![feature(concat_idents)] #![feature(concat_idents)]

2
components/style_traits/Cargo.toml
View file

@ -31,5 +31,5 @@ log = "0.3"
lazy_static = "0.1.10" lazy_static = "0.1.10"
num = "0.1.24" num = "0.1.24"
rustc-serialize = "0.3" rustc-serialize = "0.3"
serde = "0.5" serde = "0.6"
serde_macros = "0.5" serde_macros = "0.5"

2
components/util/Cargo.toml
View file

@ -52,7 +52,7 @@ smallvec = "0.1"
num_cpus = "0.2.2" num_cpus = "0.2.2"
num = "0.1.24" num = "0.1.24"
euclid = "0.2" euclid = "0.2"
serde = "0.5" serde = "0.6"
serde_macros = "0.5" serde_macros = "0.5"
string_cache = "0.1" string_cache = "0.1"
lazy_static = "0.1" lazy_static = "0.1"

2
components/util/deque/mod.rs
View file

@ -52,7 +52,7 @@ pub use self::Stolen::{Empty, Abort, Data};
use std::marker; use std::marker;
use std::mem::{forget, align_of, size_of, transmute}; use std::mem::{forget, align_of, size_of, transmute};
use std::ptr; use std::ptr;
use std::rt::heap::{allocate, deallocate}; use alloc::heap::{allocate, deallocate};
use std::sync::Arc; use std::sync::Arc;
use std::sync::Mutex; use std::sync::Mutex;

1
components/util/lib.rs
View file

@ -4,7 +4,6 @@
#![feature(alloc)] #![feature(alloc)]
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(box_raw)]
#![feature(core_intrinsics)] #![feature(core_intrinsics)]
#![feature(custom_derive)] #![feature(custom_derive)]
#![feature(fnbox)] #![feature(fnbox)]

2
components/util/mem.rs
View file

@ -53,7 +53,7 @@ extern {
// A wrapper for je_malloc_usable_size that handles `EMPTY` and returns `usize`. // A wrapper for je_malloc_usable_size that handles `EMPTY` and returns `usize`.
pub fn heap_size_of(ptr: *const c_void) -> usize { pub fn heap_size_of(ptr: *const c_void) -> usize {
if ptr == ::std::rt::heap::EMPTY as *const c_void { if ptr == ::alloc::heap::EMPTY as *const c_void {
0 0
} else { } else {
unsafe { je_malloc_usable_size(ptr) as usize } unsafe { je_malloc_usable_size(ptr) as usize }

88
ports/cef/Cargo.lock generated
View file

@ -65,7 +65,7 @@ dependencies = [
[[package]] [[package]]
name = "aster" name = "aster"
version = "0.4.4" version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -83,7 +83,7 @@ dependencies = [
"heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"skia 0.0.20130412 (git+https://github.com/servo/skia)", "skia 0.0.20130412 (git+https://github.com/servo/skia)",
"x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -97,7 +97,7 @@ dependencies = [
"byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -153,7 +153,7 @@ dependencies = [
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)", "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"plugins 0.0.1", "plugins 0.0.1",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1", "util 0.0.1",
] ]
@ -287,7 +287,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -315,7 +315,7 @@ dependencies = [
"msg 0.0.1", "msg 0.0.1",
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -332,7 +332,7 @@ dependencies = [
"msg 0.0.1", "msg 0.0.1",
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -447,7 +447,7 @@ dependencies = [
"num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -563,12 +563,12 @@ dependencies = [
"rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"script_traits 0.0.1", "script_traits 0.0.1",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"simd 0.1.0 (git+https://github.com/huonw/simd)", "simd 0.1.0 (git+https://github.com/huonw/simd)",
"skia 0.0.20130412 (git+https://github.com/servo/skia)", "skia 0.0.20130412 (git+https://github.com/servo/skia)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1", "style 0.0.1",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -743,7 +743,7 @@ dependencies = [
"phf_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rc 0.1.1 (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)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
@ -775,7 +775,7 @@ dependencies = [
"num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"solicit 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -806,7 +806,7 @@ dependencies = [
"lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -888,11 +888,11 @@ dependencies = [
"script 0.0.1", "script 0.0.1",
"script_traits 0.0.1", "script_traits 0.0.1",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1", "style 0.0.1",
"unicode-bidi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -911,7 +911,7 @@ dependencies = [
"net_traits 0.0.1", "net_traits 0.0.1",
"profile_traits 0.0.1", "profile_traits 0.0.1",
"script_traits 0.0.1", "script_traits 0.0.1",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1", "util 0.0.1",
@ -1031,7 +1031,7 @@ dependencies = [
"plugins 0.0.1", "plugins 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)", "png 0.1.0 (git+https://github.com/servo/rust-png)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1", "style_traits 0.0.1",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1074,7 +1074,7 @@ dependencies = [
"png 0.1.0 (git+https://github.com/servo/rust-png)", "png 0.1.0 (git+https://github.com/servo/rust-png)",
"regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
"regex_macros 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "regex_macros 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1140,7 +1140,7 @@ dependencies = [
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1217,7 +1217,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "plugins" name = "plugins"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"tenacious 0.0.9 (git+https://github.com/servo/rust-tenacious)", "tenacious 0.0.10 (git+https://github.com/Manishearth/rust-tenacious)",
] ]
[[package]] [[package]]
@ -1236,7 +1236,7 @@ dependencies = [
"gcc 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"png-sys 1.6.16 (git+https://github.com/servo/rust-png)", "png-sys 1.6.16 (git+https://github.com/servo/rust-png)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1268,7 +1268,7 @@ name = "profile_traits"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1276,15 +1276,15 @@ dependencies = [
[[package]] [[package]]
name = "quasi" name = "quasi"
version = "0.3.1" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "quasi_codegen" name = "quasi_codegen"
version = "0.3.1" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"aster 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "aster 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1292,7 +1292,7 @@ name = "quasi_macros"
version = "0.3.1" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"quasi_codegen 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_codegen 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1376,9 +1376,9 @@ dependencies = [
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"script_traits 0.0.1", "script_traits 0.0.1",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1", "style 0.0.1",
"tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1401,7 +1401,7 @@ dependencies = [
"msg 0.0.1", "msg 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
"profile_traits 0.0.1", "profile_traits 0.0.1",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1", "util 0.0.1",
@ -1418,13 +1418,13 @@ dependencies = [
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quickersort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "serde" name = "serde"
version = "0.5.3" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1435,8 +1435,8 @@ name = "serde_codegen"
version = "0.5.0" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"aster 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "aster 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "quasi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1446,7 +1446,7 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1555,11 +1555,11 @@ dependencies = [
[[package]] [[package]]
name = "string_cache" name = "string_cache"
version = "0.1.12" version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_shared 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1600,10 +1600,10 @@ dependencies = [
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1", "style_traits 0.0.1",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1622,7 +1622,7 @@ dependencies = [
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1", "util 0.0.1",
@ -1656,8 +1656,8 @@ dependencies = [
[[package]] [[package]]
name = "tenacious" name = "tenacious"
version = "0.0.9" version = "0.0.10"
source = "git+https://github.com/servo/rust-tenacious#a04fe4a6e6c332f94b491b9369b8e50e94b3c37d" source = "git+https://github.com/Manishearth/rust-tenacious#f02b78715ac10ddad67116448ea9697b5a03dfaa"
[[package]] [[package]]
name = "tendril" name = "tendril"
@ -1718,7 +1718,7 @@ dependencies = [
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1753,10 +1753,10 @@ dependencies = [
"rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

2
ports/glutin/lib.rs
View file

@ -4,7 +4,7 @@
//! A simple application that uses glutin to open a window for Servo to display in. //! A simple application that uses glutin to open a window for Servo to display in.
#![feature(box_syntax, result_expect)] #![feature(box_syntax)]
#[macro_use] extern crate bitflags; #[macro_use] extern crate bitflags;
#[cfg(target_os = "macos")] extern crate cgl; #[cfg(target_os = "macos")] extern crate cgl;

88
ports/gonk/Cargo.lock generated
View file

@ -51,7 +51,7 @@ dependencies = [
[[package]] [[package]]
name = "aster" name = "aster"
version = "0.4.4" version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
@ -69,7 +69,7 @@ dependencies = [
"heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize_plugin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"skia 0.0.20130412 (git+https://github.com/servo/skia)", "skia 0.0.20130412 (git+https://github.com/servo/skia)",
"x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -83,7 +83,7 @@ dependencies = [
"byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -134,7 +134,7 @@ dependencies = [
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)", "offscreen_gl_context 0.1.0 (git+https://github.com/ecoal95/rust-offscreen-rendering-context)",
"plugins 0.0.1", "plugins 0.0.1",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1", "util 0.0.1",
] ]
@ -257,7 +257,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -285,7 +285,7 @@ dependencies = [
"msg 0.0.1", "msg 0.0.1",
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -302,7 +302,7 @@ dependencies = [
"msg 0.0.1", "msg 0.0.1",
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -402,7 +402,7 @@ dependencies = [
"num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -510,12 +510,12 @@ dependencies = [
"rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"script_traits 0.0.1", "script_traits 0.0.1",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"simd 0.1.0 (git+https://github.com/huonw/simd)", "simd 0.1.0 (git+https://github.com/huonw/simd)",
"skia 0.0.20130412 (git+https://github.com/servo/skia)", "skia 0.0.20130412 (git+https://github.com/servo/skia)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1", "style 0.0.1",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -637,7 +637,7 @@ dependencies = [
"phf_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rc 0.1.1 (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)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
@ -669,7 +669,7 @@ dependencies = [
"num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"solicit 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "solicit 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -700,7 +700,7 @@ dependencies = [
"lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -782,11 +782,11 @@ dependencies = [
"script 0.0.1", "script 0.0.1",
"script_traits 0.0.1", "script_traits 0.0.1",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1", "style 0.0.1",
"unicode-bidi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -805,7 +805,7 @@ dependencies = [
"net_traits 0.0.1", "net_traits 0.0.1",
"profile_traits 0.0.1", "profile_traits 0.0.1",
"script_traits 0.0.1", "script_traits 0.0.1",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1", "util 0.0.1",
@ -916,7 +916,7 @@ dependencies = [
"plugins 0.0.1", "plugins 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)", "png 0.1.0 (git+https://github.com/servo/rust-png)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1", "style_traits 0.0.1",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -959,7 +959,7 @@ dependencies = [
"png 0.1.0 (git+https://github.com/servo/rust-png)", "png 0.1.0 (git+https://github.com/servo/rust-png)",
"regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
"regex_macros 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "regex_macros 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1025,7 +1025,7 @@ dependencies = [
"layers 0.1.0 (git+https://github.com/servo/rust-layers)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1093,7 +1093,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "plugins" name = "plugins"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"tenacious 0.0.9 (git+https://github.com/servo/rust-tenacious)", "tenacious 0.0.10 (git+https://github.com/Manishearth/rust-tenacious)",
] ]
[[package]] [[package]]
@ -1112,7 +1112,7 @@ dependencies = [
"gcc 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"png-sys 1.6.16 (git+https://github.com/servo/rust-png)", "png-sys 1.6.16 (git+https://github.com/servo/rust-png)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1144,7 +1144,7 @@ name = "profile_traits"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)", "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1152,15 +1152,15 @@ dependencies = [
[[package]] [[package]]
name = "quasi" name = "quasi"
version = "0.3.1" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "quasi_codegen" name = "quasi_codegen"
version = "0.3.1" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"aster 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "aster 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1168,7 +1168,7 @@ name = "quasi_macros"
version = "0.3.1" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"quasi_codegen 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_codegen 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1252,9 +1252,9 @@ dependencies = [
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"script_traits 0.0.1", "script_traits 0.0.1",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1", "style 0.0.1",
"tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1277,7 +1277,7 @@ dependencies = [
"msg 0.0.1", "msg 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
"profile_traits 0.0.1", "profile_traits 0.0.1",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1", "util 0.0.1",
@ -1294,13 +1294,13 @@ dependencies = [
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quickersort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "serde" name = "serde"
version = "0.5.3" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1311,8 +1311,8 @@ name = "serde_codegen"
version = "0.5.0" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"aster 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "aster 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "quasi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_macros 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1322,7 +1322,7 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1411,11 +1411,11 @@ dependencies = [
[[package]] [[package]]
name = "string_cache" name = "string_cache"
version = "0.1.12" version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_shared 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1456,10 +1456,10 @@ dependencies = [
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"style_traits 0.0.1", "style_traits 0.0.1",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1478,7 +1478,7 @@ dependencies = [
"plugins 0.0.1", "plugins 0.0.1",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1", "util 0.0.1",
@ -1501,8 +1501,8 @@ dependencies = [
[[package]] [[package]]
name = "tenacious" name = "tenacious"
version = "0.0.9" version = "0.0.10"
source = "git+https://github.com/servo/rust-tenacious#a04fe4a6e6c332f94b491b9369b8e50e94b3c37d" source = "git+https://github.com/Manishearth/rust-tenacious#f02b78715ac10ddad67116448ea9697b5a03dfaa"
[[package]] [[package]]
name = "tendril" name = "tendril"
@ -1563,7 +1563,7 @@ dependencies = [
"encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1598,10 +1598,10 @@ dependencies = [
"rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

2
rust-snapshot-hash
View file

@ -1 +1 @@
cb9323ec096dbc4b3766b770309102c7e2ed9875/rustc-1.4.0-dev f93ab64d4a1a7ee91759a1594ab2a426b6cc657e/rustc-1.5.0-dev

2
tests/unit/net/lib.rs
View file

@ -2,8 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![cfg_attr(test, feature(box_raw))]
extern crate cookie as cookie_rs; extern crate cookie as cookie_rs;
extern crate flate2; extern crate flate2;
extern crate hyper; extern crate hyper;

7
tests/unit/util/lib.rs
View file

@ -4,9 +4,12 @@
#![cfg_attr(test, feature(plugin, custom_derive, heap_api))] #![cfg_attr(test, feature(plugin, custom_derive, heap_api))]
#![cfg_attr(test, plugin(plugins))] #![cfg_attr(test, plugin(plugins))]
extern crate util; #![feature(alloc)]
extern crate libc;
extern crate alloc;
extern crate euclid; extern crate euclid;
extern crate libc;
extern crate util;
#[cfg(test)] mod cache; #[cfg(test)] mod cache;
#[cfg(test)] mod logical_geometry; #[cfg(test)] mod logical_geometry;

14
tests/unit/util/mem.rs
View file

@ -34,22 +34,22 @@ fn test_heap_size() {
unsafe { unsafe {
// EMPTY is the special non-null address used to represent zero-size allocations. // EMPTY is the special non-null address used to represent zero-size allocations.
assert_eq!(heap_size_of(::std::rt::heap::EMPTY as *const c_void), 0); assert_eq!(heap_size_of(::alloc::heap::EMPTY as *const c_void), 0);
// A 64 byte request is allocated exactly. // A 64 byte request is allocated exactly.
let x = ::std::rt::heap::allocate(64, 0); let x = ::alloc::heap::allocate(64, 0);
assert_eq!(heap_size_of(x as *const c_void), 64); assert_eq!(heap_size_of(x as *const c_void), 64);
::std::rt::heap::deallocate(x, 64, 0); ::alloc::heap::deallocate(x, 64, 0);
// A 255 byte request is rounded up to 256 bytes. // A 255 byte request is rounded up to 256 bytes.
let x = ::std::rt::heap::allocate(255, 0); let x = ::alloc::heap::allocate(255, 0);
assert_eq!(heap_size_of(x as *const c_void), 256); assert_eq!(heap_size_of(x as *const c_void), 256);
::std::rt::heap::deallocate(x, 255, 0); ::alloc::heap::deallocate(x, 255, 0);
// A 1MiB request is allocated exactly. // A 1MiB request is allocated exactly.
let x = ::std::rt::heap::allocate(1024 * 1024, 0); let x = ::alloc::heap::allocate(1024 * 1024, 0);
assert_eq!(heap_size_of(x as *const c_void), 1024 * 1024); assert_eq!(heap_size_of(x as *const c_void), 1024 * 1024);
::std::rt::heap::deallocate(x, 1024 * 1024, 0); ::alloc::heap::deallocate(x, 1024 * 1024, 0);
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------