Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-03 05:23:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to rustc 1.6.0-nightly (d5fde83ae 2015-11-12)

Browse source 
… and libc 0.2 and many other dependencies
This commit is contained in:
Manish Goregaokar 2015-11-07 22:40:18 +05:30 • committed by Josh Matthews
parent bc618b0d53
commit dc0e467945
59 changed files with 1092 additions and 978 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/compositing/Cargo.toml
View file

@ -64,17 +64,13 @@ git = "https://github.com/servo/ipc-channel"
git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
features = ["texture_surface"]
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[dependencies.gaol]
git = "https://github.com/pcwalton/gaol"
[dependencies]
app_units = {version = "0.1", features = ["plugins"]}
image = "0.4.0"
libc = "0.1"
image = "0.5.0"
libc = "0.2"
log = "0.3"
num = "0.1.24"
time = "0.1.17"
@ -82,6 +78,7 @@ gleam = "0.1"
euclid = {version = "0.3", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.6"
url = "0.5"
[target.x86_64-apple-darwin.dependencies]
core-graphics = "0.1"

11
components/devtools/Cargo.toml
View file

@ -7,10 +7,6 @@ authors = ["The Servo Project Developers"]
name = "devtools"
path = "lib.rs"
[dependencies.hyper]
version = "0.6"
features = [ "serde-serialization" ]
[dependencies.devtools_traits]
path = "../devtools_traits"
@ -26,14 +22,11 @@ path = "../plugins"
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[dependencies]
hyper = { version = "0.7", features = [ "serde-serialization" ] }
log = "0.3"
time = "0.1"
rustc-serialize = "0.3"
serde = "0.6"
serde_macros = "0.6"
url = "0.5"

10
components/devtools_traits/Cargo.toml
View file

@ -7,20 +7,12 @@ authors = ["The Servo Project Developers"]
name = "devtools_traits"
path = "lib.rs"
[dependencies.hyper]
version = "0.6"
features = [ "serde-serialization" ]
[dependencies.msg]
path = "../msg"
[dependencies.util]
path = "../util"
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
@ -28,9 +20,11 @@ git = "https://github.com/servo/ipc-channel"
path = "../plugins"
[dependencies]
hyper = { version = "0.7", features = [ "serde-serialization" ] }
time = "0.1"
rustc-serialize = "0.3"
bitflags = "0.3"
serde = "0.6"
serde_macros = "0.6"
url = "0.5"

7
components/gfx/Cargo.toml
View file

@ -15,7 +15,7 @@ euclid = {version = "0.3", features = ["plugins"]}
fnv = "1.0"
harfbuzz-sys = "0.1"
lazy_static = "0.1"
libc = "0.1"
libc = "0.2"
log = "0.3"
rand = "0.3"
rustc-serialize = "0.3"
@ -25,6 +25,7 @@ smallvec = "0.1"
string_cache = "0.2"
time = "0.1.12"
unicode-script = { version = "0.1", features = ["harfbuzz"] }
url = "0.5"
[dependencies.plugins]
path = "../plugins"
@ -67,10 +68,6 @@ path = "../script_traits"
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[target.x86_64-apple-darwin.dependencies]
core-foundation = "0.1"
core-graphics = "0.1"

5
components/gfx/paint_context.rs
View file

@ -27,7 +27,6 @@ use euclid::size::Size2D;
use filters;
use font_context::FontContext;
use gfx_traits::color;
use libc::types::common::c99::uint32_t;
use msg::compositor_msg::LayerKind;
use net_traits::image::base::{Image, PixelFormat};
use std::default::Default;
@ -1803,7 +1802,7 @@ impl ScaledFontExtensionMethods for ScaledFont {
let glyph_advance = glyph.advance();
let glyph_offset = glyph.offset().unwrap_or(Point2D::zero());
let azglyph = struct__AzGlyph {
mIndex: glyph.id() as uint32_t,
mIndex: glyph.id() as u32,
mPosition: struct__AzPoint {
x: (origin.x + glyph_offset.x).to_f32_px(),
y: (origin.y + glyph_offset.y).to_f32_px(),
@ -1819,7 +1818,7 @@ impl ScaledFontExtensionMethods for ScaledFont {
let mut glyphbuf = struct__AzGlyphBuffer {
mGlyphs: azglyphs.as_mut_ptr(),
mNumGlyphs: azglyph_buf_len as uint32_t
mNumGlyphs: azglyph_buf_len as u32
};
unsafe {

7
components/layout/Cargo.toml
View file

@ -59,10 +59,6 @@ git = "https://github.com/tomaka/clock_ticks"
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[dependencies]
app_units = {version = "0.1", features = ["plugins"]}
cssparser = { version = "0.4", features = [ "serde-serialization" ] }
@ -71,7 +67,7 @@ encoding = "0.2"
fnv = "1.0"
bitflags = "0.3"
rustc-serialize = "0.3"
libc = "0.1"
libc = "0.2"
selectors = "0.2"
smallvec = "0.1"
string_cache = "0.2"
@ -81,3 +77,4 @@ serde_macros = "0.6"
serde_json = "0.5"
unicode-bidi = "0.2"
unicode-script = { version = "0.1", features = ["harfbuzz"] }
url = "0.5"

6
components/layout_traits/Cargo.toml
View file

@ -28,12 +28,8 @@ path = "../util"
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[dependencies]
euclid = {version = "0.3", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.6"
url = "0.5"

10
components/msg/Cargo.toml
View file

@ -24,14 +24,6 @@ features = ["plugins"]
git = "https://github.com/servo/rust-layers"
features = ["plugins"]
[dependencies.hyper]
version = "0.6"
features = [ "serde-serialization" ]
[dependencies.url]
version = "0.2.36"
features = [ "serde_serialization" ]
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
@ -45,10 +37,12 @@ path = "../plugins"
[dependencies]
app_units = {version = "0.1", features = ["plugins"]}
bitflags = "0.3"
hyper = { version = "0.7", features = [ "serde-serialization" ] }
rustc-serialize = "0.3.4"
euclid = {version = "0.3", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.6"
url = "0.5"
[target.x86_64-apple-darwin.dependencies]
core-foundation = "0.1"

14
components/net/Cargo.toml
View file

@ -22,27 +22,21 @@ git = "https://github.com/ende76/brotli-rs"
[dependencies.plugins]
path = "../plugins"
[dependencies.hyper]
version = "0.6"
features = [ "serde-serialization" ]
[dependencies.msg]
path = "../msg"
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[dependencies]
hyper = { version = "0.7", features = [ "serde-serialization" ] }
log = "0.3"
time = "0.1.17"
openssl="0.6.1"
openssl = "0.7.0"
rustc-serialize = "0.3"
cookie = "0.1"
cookie = "0.2"
mime_guess = "1.1.1"
flate2 = "0.2.0"
uuid = "0.1.16"
euclid = {version = "0.3", features = ["plugins"]}
url = "0.5"

1
components/net/about_loader.rs
View file

@ -10,7 +10,6 @@ use mime_classifier::MIMEClassifier;
use net_traits::ProgressMsg::Done;
use net_traits::{LoadConsumer, LoadData, Metadata};
use resource_task::{CancellationListener, send_error, start_sending_sniffed_opt};
use std::fs::PathExt;
use std::sync::Arc;
use url::Url;
use util::resource_files::resources_dir_path;

2
components/net/cookie.rs
View file

@ -115,7 +115,7 @@ impl Cookie {
pub fn path_match(request_path: &str, cookie_path: &str) -> bool {
request_path == cookie_path ||
( request_path.starts_with(cookie_path) &&
( request_path.ends_with("/") || request_path.as_bytes()[cookie_path.len() - 1] == b'/' )
( request_path.ends_with("/") || request_path[cookie_path.len()..].starts_with("/"))
)
}

12
components/net_traits/Cargo.toml
View file

@ -16,23 +16,17 @@ path = "../msg"
[dependencies.stb_image]
git = "https://github.com/servo/rust-stb-image"
[dependencies.hyper]
version = "0.6"
features = [ "serde-serialization" ]
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[dependencies.plugins]
path = "../plugins"
[dependencies]
log = "0.3"
euclid = {version = "0.3", features = ["plugins"]}
image = "0.4.0"
hyper = { version = "0.7", features = [ "serde-serialization" ] }
image = "0.5.0"
serde = "0.6"
serde_macros = "0.6"
url = "0.5"

4
components/plugins/Cargo.toml
View file

@ -16,8 +16,8 @@ git = "https://github.com/Manishearth/rust-clippy"
branch = "servo"
optional = true
[dependencies.url]
version = "0.2.36"
[dependencies]
url = "0.5"
[features]
default = []

2
components/plugins/lib.rs
View file

@ -13,7 +13,7 @@
//! - `#[dom_struct]` : Implies `#[privatize]`,`#[derive(JSTraceable)]`, and `#[must_root]`.
//! Use this for structs that correspond to a DOM type
#![feature(plugin_registrar, quote, plugin, box_syntax, rustc_private)]
#![feature(plugin_registrar, quote, plugin, box_syntax, rustc_private, slice_patterns)]
#[macro_use]
extern crate syntax;

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

@ -24,13 +24,13 @@ impl LintPass for InheritancePass {
}
impl LateLintPass for InheritancePass {
fn check_struct_def(&mut self, cx: &LateContext, def: &hir::StructDef, _n: ast::Name,
fn check_struct_def(&mut self, cx: &LateContext, def: &hir::VariantData, _n: ast::Name,
_gen: &hir::Generics, id: ast::NodeId) {
// Lints are run post expansion, so it's fine to use
// #[_dom_struct_marker] here without also checking for #[dom_struct]
if cx.tcx.has_attr(cx.tcx.map.local_def_id(id), "_dom_struct_marker") {
// Find the reflector, if any
let reflector_span = def.fields.iter().enumerate()
let reflector_span = def.fields().iter().enumerate()
.find(|&(ctr, f)| {
if match_lang_ty(cx, &*f.node.ty, "reflector") {
if ctr > 0 {
@ -44,7 +44,7 @@ impl LateLintPass for InheritancePass {
})
.map(|(_, f)| f.span);
// 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 hir::TyPath(..) = f.node.ty.node {
if let Some(&def::PathResolution { base_def: def::DefTy(def_id, _), .. }) =
cx.tcx.def_map.borrow().get(&f.node.ty.id) {

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

@ -25,12 +25,12 @@ impl LintPass for PrivatizePass {
impl LateLintPass for PrivatizePass {
fn check_struct_def(&mut self,
cx: &LateContext,
def: &hir::StructDef,
def: &hir::VariantData,
_n: ast::Name,
_gen: &hir::Generics,
id: ast::NodeId) {
if cx.tcx.has_attr(cx.tcx.map.local_def_id(id), "privatize") {
for field in &def.fields {
for field in def.fields() {
match field.node {
hir::StructField_ { kind: hir::NamedField(name, visibility), .. } if visibility == hir::Public => {
cx.span_lint(PRIVATIZE, field.span,

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

@ -80,7 +80,7 @@ impl LateLintPass for UnrootedPass {
/// All structs containing #[must_root] types must be #[must_root] themselves
fn check_struct_def(&mut self,
cx: &LateContext,
def: &hir::StructDef,
def: &hir::VariantData,
_n: ast::Name,
_gen: &hir::Generics,
id: ast::NodeId) {
@ -89,7 +89,7 @@ impl LateLintPass for UnrootedPass {
_ => cx.tcx.map.expect_item(cx.tcx.map.get_parent(id)),
};
if item.attrs.iter().all(|a| !a.check_name("must_root")) {
for ref field in &def.fields {
for ref field in def.fields() {
if is_unrooted_ty(cx, cx.tcx.node_id_to_type(field.node.id), false) {
cx.span_lint(UNROOTED_MUST_ROOT, field.span,
"Type must be rooted, use #[must_root] on the struct definition to propagate")
@ -101,13 +101,13 @@ impl LateLintPass for UnrootedPass {
/// All enums containing #[must_root] types must be #[must_root] themselves
fn check_variant(&mut self, cx: &LateContext, var: &hir::Variant, _gen: &hir::Generics) {
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")) {
match var.node.kind {
hir::TupleVariantKind(ref vec) => {
if map.expect_item(map.get_parent(var.node.data.id())).attrs.iter().all(|a| !a.check_name("must_root")) {
match var.node.data {
hir::VariantData::Tuple(ref vec, _) => {
for ty in vec {
cx.tcx.ast_ty_to_ty_cache.borrow().get(&ty.id).map(|t| {
cx.tcx.ast_ty_to_ty_cache.borrow().get(&ty.node.id).map(|t| {
if is_unrooted_ty(cx, t, false) {
cx.span_lint(UNROOTED_MUST_ROOT, ty.ty.span,
cx.span_lint(UNROOTED_MUST_ROOT, ty.node.ty.span,
"Type must be rooted, use #[must_root] on \
the enum definition to propagate")
}

4
components/plugins/reflector.rs
View file

@ -15,7 +15,7 @@ pub fn expand_reflector(cx: &mut ExtCtxt, span: Span, _: &MetaItem, annotatable:
if let ast::ItemStruct(ref def, _) = item.node {
let struct_name = item.ident;
// This path has to be hardcoded, unfortunately, since we can't resolve paths at expansion time
match def.fields.iter().find(
match def.fields().iter().find(
|f| match_ty_unwrap(&*f.node.ty, &["dom", "bindings", "reflector", "Reflector"]).is_some()) {
// If it has a field that is a Reflector, use that
Some(f) => {
@ -34,7 +34,7 @@ pub fn expand_reflector(cx: &mut ExtCtxt, span: Span, _: &MetaItem, annotatable:
},
// Or just call it on the first field (supertype).
None => {
let field_name = def.fields[0].node.ident();
let field_name = def.fields()[0].node.ident();
let impl_item = quote_item!(cx,
impl ::dom::bindings::reflector::Reflectable for $struct_name {
fn reflector<'a>(&'a self) -> &'a ::dom::bindings::reflector::Reflector {

21
components/plugins/url_plugin.rs
View file

@ -16,7 +16,7 @@ use url::{Url, Host, RelativeSchemeData, SchemeData};
pub fn expand_url(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree])
-> Box<MacResult + 'static> {
let mut parser = parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), tts.to_vec());
let query_expr = cx.expander().fold_expr(parser.parse_expr());
let query_expr = cx.expander().fold_expr(parser.parse_expr_nopanic().unwrap());
// Ensure a str literal was passed to the macro
let query = match parse_str_lit(&query_expr) {
@ -114,17 +114,22 @@ impl<'a> ExtCtxtHelpers for ExtCtxt<'a> {
}
}
fn expr_host(&self, sp: Span, host: Host) -> syntax::ptr::P<Expr> {
fn expr_host(&self, _sp: Span, host: Host) -> syntax::ptr::P<Expr> {
match host {
Host::Domain(domain) => quote_expr!(self, ::url::Host::Domain(String::from($domain))),
Host::Ipv6(address) => {
let pieces_expr = self.expr_slice_u16(sp, &address.pieces);
let [a, b, c, d, e, f, g, h] = address.segments();
quote_expr!(self,
::url::Host::Ipv6(
::url::Ipv6Address {
pieces: $pieces_expr.to_owned()
}
))
::url::Host::Ipv6(::std::net::Ipv6Addr::new(
$a, $b, $c, $d, $e, $f, $g, $h
)))
},
Host::Ipv4(address) => {
let [a, b, c, d] = address.octets();
quote_expr!(self,
::url::Host::Ipv4(::std::net::Ipv4Addr::new(
$a, $b, $c, $d
)))
},
}
}

2
components/profile/Cargo.toml
View file

@ -24,7 +24,7 @@ git = "https://github.com/servo/ipc-channel"
[dependencies]
log = "0.3"
libc = "0.1"
libc = "0.2"
regex = "0.1.14"
time = "0.1.12"

16
components/script/Cargo.toml
View file

@ -48,10 +48,6 @@ path = "../canvas_traits"
[dependencies.js]
git = "https://github.com/servo/rust-mozjs"
[dependencies.url]
version = "0.2.36"
features = ["query_encoding", "serde_serialization"]
[dependencies.offscreen_gl_context]
git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
@ -62,10 +58,6 @@ branch = "servo"
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies.hyper]
version = "0.6"
features = [ "serde-serialization" ]
[dependencies.xml5ever]
git = "https://github.com/Ygg01/xml5ever"
features = ["unstable"]
@ -76,13 +68,14 @@ cssparser = { version = "0.4", features = [ "serde-serialization" ] }
log = "0.3"
encoding = "0.2"
fnv = "1.0"
hyper = { version = "0.7", features = [ "serde-serialization" ] }
time = "0.1.12"
bitflags = "0.3"
rustc-serialize = "0.3"
libc = "0.1"
libc = "0.2"
unicase = "1.0"
num = "0.1.24"
websocket = "0.12.0"
websocket = "0.14.0"
uuid = "0.1.16"
smallvec = "0.1"
html5ever = { version = "0.2.1", features = ["unstable"] }
@ -93,4 +86,5 @@ tendril = "0.1.1"
rand = "0.3"
serde = "0.6"
caseless = "0.1.0"
image = "0.4.0"
image = "0.5.0"
url = "0.5"

2
components/script/dom/document.rs
View file

@ -1659,7 +1659,7 @@ impl DocumentMethods for Document {
if let Some(&Host::Ipv6(ipv6)) = origin.host() {
// Omit square brackets for IPv6 addresses.
return DOMString::from(ipv6.serialize());
return DOMString::from(ipv6.to_string());
}
DOMString::from(origin.serialize_host().unwrap_or_else(|| "".to_owned()))

30
components/script/dom/websocket.rs
View file

@ -39,7 +39,7 @@ use websocket::client::receiver::Receiver;
use websocket::client::request::Url;
use websocket::client::sender::Sender;
use websocket::header::Origin;
use websocket::message::CloseData;
use websocket::message::Type;
use websocket::result::WebSocketResult;
use websocket::stream::WebSocketStream;
use websocket::ws::receiver::Receiver as WSReceiver;
@ -264,23 +264,27 @@ impl WebSocket {
sender.send(CommonScriptMsg::RunnableMsg(WebSocketEvent, open_task)).unwrap();
for message in receiver.incoming_messages() {
let message = match message {
Ok(Message::Text(text)) => MessageData::Text(text),
Ok(Message::Binary(data)) => MessageData::Binary(data),
Ok(Message::Ping(data)) => {
ws_sender.lock().unwrap().send_message(Message::Pong(data)).unwrap();
let message: Message = match message {
Ok(m) => m,
Err(_) => break,
};
let message = match message.opcode {
Type::Text => MessageData::Text(String::from_utf8_lossy(&message.payload).into_owned()),
Type::Binary => MessageData::Binary(message.payload.into_owned()),
Type::Ping => {
let pong = Message::pong(message.payload);
ws_sender.lock().unwrap().send_message(&pong).unwrap();
continue;
},
Ok(Message::Pong(_)) => continue,
Ok(Message::Close(data)) => {
ws_sender.lock().unwrap().send_message(Message::Close(data)).unwrap();
Type::Pong => continue,
Type::Close => {
ws_sender.lock().unwrap().send_message(&message).unwrap();
let task = box CloseTask {
addr: address,
};
sender.send(CommonScriptMsg::RunnableMsg(WebSocketEvent, task)).unwrap();
break;
},
Err(_) => break,
};
let message_task = box MessageReceivedTask {
address: address.clone(),
@ -385,7 +389,7 @@ impl WebSocketMethods for WebSocket {
if send_data {
let mut other_sender = self.sender.borrow_mut();
let my_sender = other_sender.as_mut().unwrap();
let _ = my_sender.lock().unwrap().send_message(Message::Text(data.0));
let _ = my_sender.lock().unwrap().send_message(&Message::text(data.0));
}
Ok(())
@ -404,7 +408,7 @@ impl WebSocketMethods for WebSocket {
if send_data {
let mut other_sender = self.sender.borrow_mut();
let my_sender = other_sender.as_mut().unwrap();
let _ = my_sender.lock().unwrap().send_message(Message::Binary(data.clone_bytes()));
let _ = my_sender.lock().unwrap().send_message(&Message::binary(data.clone_bytes()));
}
Ok(())
@ -420,7 +424,7 @@ impl WebSocketMethods for WebSocket {
if let Some(sender) = sender.as_mut() {
let code: u16 = this.code.get();
let reason = this.reason.borrow().clone();
let _ = sender.lock().unwrap().send_message(Message::Close(Some(CloseData::new(code, reason))));
let _ = sender.lock().unwrap().send_message(&Message::close_because(code, reason));
}
}

7
components/script_traits/Cargo.toml
View file

@ -28,14 +28,11 @@ path = "../devtools_traits"
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[dependencies]
app_units = {version = "0.1", features = ["plugins"]}
libc = "0.1"
libc = "0.2"
euclid = {version = "0.3", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.6"
time = "0.1.12"
url = "0.5"

570
components/servo/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

10
components/servo/Cargo.toml
View file

@ -18,7 +18,7 @@ doc = false
bench = false
[dev-dependencies]
image = "0.4.0"
image = "0.5.0"
[dev-dependencies.gfx_tests]
path = "../../tests/unit/gfx"
@ -124,10 +124,6 @@ optional = true
version = "0.3"
features = ["release_max_level_info"]
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[dependencies.euclid]
version = "0.3"
features = ["plugins"]
@ -152,4 +148,6 @@ git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
env_logger = "0.3"
time = "0.1.12"
bitflags = "0.3"
libc = "0.1"
libc = "0.2"
url = {version = "0.5", features = ["serde_serialization", "query_encoding"]}

10
components/servo/main.rs
View file

@ -229,7 +229,7 @@ mod android {
use std::borrow::ToOwned;
pub fn setup_logging() {
use self::libc::consts::os::posix88::{STDERR_FILENO, STDOUT_FILENO};
use self::libc::{STDERR_FILENO, STDOUT_FILENO};
//use std::env;
//env::set_var("RUST_LOG", "servo,gfx,msg,util,layers,js,std,rt,extra");
@ -239,14 +239,14 @@ mod android {
unsafe { super::app_dummy(); }
}
struct FilePtr(*mut self::libc::types::common::c95::FILE);
struct FilePtr(*mut self::libc::FILE);
unsafe impl Send for FilePtr {}
fn redirect_output(file_no: c_int) {
use self::libc::funcs::c95::stdio::fgets;
use self::libc::funcs::posix88::stdio::fdopen;
use self::libc::funcs::posix88::unistd::{pipe, dup2};
use self::libc::fdopen;
use self::libc::fgets;
use self::libc::{pipe, dup2};
use servo::util::task::spawn_named;
use std::ffi::CStr;
use std::ffi::CString;

6
components/style/Cargo.toml
View file

@ -18,10 +18,6 @@ path = "../util"
[dependencies.style_traits]
path = "../style_traits"
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[dependencies]
app_units = {version = "0.1", features = ["plugins"]}
cssparser = { version = "0.4", features = [ "serde-serialization" ] }
@ -39,3 +35,5 @@ string_cache = "0.2"
euclid = {version = "0.3", features = ["plugins"]}
serde = "0.6"
serde_macros = "0.6"
url = "0.5"

6
components/style_traits/Cargo.toml
View file

@ -13,10 +13,6 @@ path = "../util"
[dependencies.plugins]
path = "../plugins"
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[dependencies]
cssparser = { version = "0.4", features = [ "serde-serialization" ] }
euclid = {version = "0.3", features = ["plugins"]}
@ -27,3 +23,5 @@ rustc-serialize = "0.3"
selectors = "0.2"
serde = "0.6"
serde_macros = "0.6"
url = "0.5"

9
components/util/Cargo.toml
View file

@ -32,17 +32,13 @@ features = ["plugins"]
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[dependencies]
app_units = {version = "0.1", features = ["plugins"]}
cssparser = { version = "0.4", features = [ "serde-serialization" ] }
log = "0.3"
bitflags = "0.3"
html5ever = { version = "0.2.1", features = ["unstable"] }
libc = "0.1"
libc = "0.2"
rand = "0.3"
rustc-serialize = "0.3"
smallvec = "0.1"
@ -55,5 +51,6 @@ serde_macros = "0.6"
string_cache = "0.2"
lazy_static = "0.1"
getopts = "0.2.11"
hyper = "0.6"
hyper = "0.7"
url = "0.5"
uuid = "0.1.17"

2
components/util/lib.rs
View file

@ -12,10 +12,8 @@
#![feature(heap_api)]
#![feature(oom)]
#![feature(optin_builtin_traits)]
#![cfg_attr(not(target_os = "android"), feature(path_ext))]
#![feature(plugin)]
#![feature(reflect_marker)]
#![feature(slice_splits)]
#![feature(step_by)]
#![feature(step_trait)]
#![feature(zero_one)]

3
components/util/mem.rs
View file

@ -157,7 +157,8 @@ impl HeapSizeOf for url::Host {
fn heap_size_of_children(&self) -> usize {
match *self {
url::Host::Domain(ref str) => str.heap_size_of_children(),
url::Host::Ipv6(_) => 0
url::Host::Ipv6(_) => 0,
url::Host::Ipv4(_) => 0,
}
}
}

1
components/util/resource_files.rs
View file

@ -26,7 +26,6 @@ pub fn resources_dir_path() -> PathBuf {
#[cfg(not(target_os = "android"))]
pub fn resources_dir_path() -> PathBuf {
use std::env;
use std::fs::PathExt;
match *CMD_RESOURCE_DIR.lock().unwrap() {
Some(ref path) => PathBuf::from(path),

2
components/util/workqueue.rs
View file

@ -8,7 +8,7 @@
//! higher-level API on top of this could allow safe fork-join parallelism.
use deque::{Abort, BufferPool, Data, Empty, Stealer, Worker};
use libc::funcs::posix88::unistd::usleep;
use libc::usleep;
use rand::{Rng, XorShiftRng, weak_rng};
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::mpsc::{Receiver, Sender, channel};

9
components/webdriver_server/Cargo.toml
View file

@ -22,14 +22,11 @@ git = "https://github.com/jgraham/webdriver-rust.git"
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[dependencies]
image = "0.4.0"
image = "0.5.0"
log = "0.3"
hyper = "0.6"
hyper = "0.7"
rustc-serialize = "0.3.4"
regex = "0.1.33"
url = "0.5"
uuid = "0.1"