Skip to content

Commit 106f43c

Browse files
author
bors-servo
committed
Auto merge of #8446 - servo:rustup_20151110, r=<try>
Rust upgrade to rustc 1.6.0-nightly (5b4986fa5 2015-11-08) <s>DO NOT r+ or try+ this</s> <s>It causes an OOM (rust-lang/rust#29740) and can crash the OS. Probably will set our CI on fire. </s> <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8446) <!-- Reviewable:end -->
2 parents 5e7306b + 3c6c02f commit 106f43c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1003
-807
lines changed

‎components/compositing/Cargo.toml

+2-5
Original file line numberDiff line numberDiff line change
@@ -64,24 +64,21 @@ git = "https://github.com/servo/ipc-channel"
6464
git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
6565
features = ["texture_surface"]
6666

67-
[dependencies.url]
68-
version = "0.2"
69-
features = [ "serde_serialization" ]
70-
7167
[dependencies.gaol]
7268
git = "https://github.com/pcwalton/gaol"
7369

7470
[dependencies]
7571
app_units = {version = "0.1", features = ["plugins"]}
7672
image = "0.4.0"
77-
libc = "0.1"
73+
libc = "0.2"
7874
log = "0.3"
7975
num = "0.1.24"
8076
time = "0.1.17"
8177
gleam = "0.1"
8278
euclid = {version = "0.3", features = ["plugins"]}
8379
serde = "0.6"
8480
serde_macros = "0.6"
81+
url = "0.5"
8582

8683
[target.x86_64-apple-darwin.dependencies]
8784
core-graphics = "0.1"

‎components/devtools/Cargo.toml

+2-9
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ authors = ["The Servo Project Developers"]
77
name = "devtools"
88
path = "lib.rs"
99

10-
[dependencies.hyper]
11-
version = "0.6"
12-
features = [ "serde-serialization" ]
13-
1410
[dependencies.devtools_traits]
1511
path = "../devtools_traits"
1612

@@ -26,14 +22,11 @@ path = "../plugins"
2622
[dependencies.ipc-channel]
2723
git = "https://github.com/servo/ipc-channel"
2824

29-
[dependencies.url]
30-
version = "0.2"
31-
features = [ "serde_serialization" ]
32-
3325
[dependencies]
26+
hyper = { version = "0.7", features = [ "serde-serialization" ] }
3427
log = "0.3"
3528
time = "0.1"
3629
rustc-serialize = "0.3"
3730
serde = "0.6"
3831
serde_macros = "0.6"
39-
32+
url = "0.5"

‎components/devtools_traits/Cargo.toml

+2-8
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,24 @@ authors = ["The Servo Project Developers"]
77
name = "devtools_traits"
88
path = "lib.rs"
99

10-
[dependencies.hyper]
11-
version = "0.6"
12-
features = [ "serde-serialization" ]
13-
1410
[dependencies.msg]
1511
path = "../msg"
1612

1713
[dependencies.util]
1814
path = "../util"
1915

20-
[dependencies.url]
21-
version = "0.2"
22-
features = [ "serde_serialization" ]
23-
2416
[dependencies.ipc-channel]
2517
git = "https://github.com/servo/ipc-channel"
2618

2719
[dependencies.plugins]
2820
path = "../plugins"
2921

3022
[dependencies]
23+
hyper = { version = "0.7", features = [ "serde-serialization" ] }
3124
time = "0.1"
3225
rustc-serialize = "0.3"
3326
bitflags = "0.3"
3427
serde = "0.6"
3528
serde_macros = "0.6"
29+
url = "0.5"
3630

‎components/gfx/Cargo.toml

+2-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ euclid = {version = "0.3", features = ["plugins"]}
1515
fnv = "1.0"
1616
harfbuzz-sys = "0.1"
1717
lazy_static = "0.1"
18-
libc = "0.1"
18+
libc = "0.2"
1919
log = "0.3"
2020
rand = "0.3"
2121
rustc-serialize = "0.3"
@@ -25,6 +25,7 @@ smallvec = "0.1"
2525
string_cache = "0.2"
2626
time = "0.1.12"
2727
unicode-script = { version = "0.1", features = ["harfbuzz"] }
28+
url = "0.5"
2829

2930
[dependencies.plugins]
3031
path = "../plugins"
@@ -67,10 +68,6 @@ path = "../script_traits"
6768
[dependencies.ipc-channel]
6869
git = "https://github.com/servo/ipc-channel"
6970

70-
[dependencies.url]
71-
version = "0.2"
72-
features = [ "serde_serialization" ]
73-
7471
[target.x86_64-apple-darwin.dependencies]
7572
core-foundation = "0.1"
7673
core-graphics = "0.1"

‎components/gfx/paint_context.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ use euclid::size::Size2D;
2727
use filters;
2828
use font_context::FontContext;
2929
use gfx_traits::color;
30-
use libc::types::common::c99::uint32_t;
3130
use msg::compositor_msg::LayerKind;
3231
use net_traits::image::base::{Image, PixelFormat};
3332
use std::default::Default;
@@ -1803,7 +1802,7 @@ impl ScaledFontExtensionMethods for ScaledFont {
18031802
let glyph_advance = glyph.advance();
18041803
let glyph_offset = glyph.offset().unwrap_or(Point2D::zero());
18051804
let azglyph = struct__AzGlyph {
1806-
mIndex: glyph.id() as uint32_t,
1805+
mIndex: glyph.id() as u32,
18071806
mPosition: struct__AzPoint {
18081807
x: (origin.x + glyph_offset.x).to_f32_px(),
18091808
y: (origin.y + glyph_offset.y).to_f32_px(),
@@ -1819,7 +1818,7 @@ impl ScaledFontExtensionMethods for ScaledFont {
18191818

18201819
let mut glyphbuf = struct__AzGlyphBuffer {
18211820
mGlyphs: azglyphs.as_mut_ptr(),
1822-
mNumGlyphs: azglyph_buf_len as uint32_t
1821+
mNumGlyphs: azglyph_buf_len as u32
18231822
};
18241823

18251824
unsafe {

‎components/layout/Cargo.toml

+2-5
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ git = "https://github.com/tomaka/clock_ticks"
5656
[dependencies.ipc-channel]
5757
git = "https://github.com/servo/ipc-channel"
5858

59-
[dependencies.url]
60-
version = "0.2"
61-
features = [ "serde_serialization" ]
62-
6359
[dependencies]
6460
app_units = {version = "0.1", features = ["plugins"]}
6561
cssparser = { version = "0.4", features = [ "serde-serialization" ] }
@@ -68,7 +64,7 @@ encoding = "0.2"
6864
fnv = "1.0"
6965
bitflags = "0.3"
7066
rustc-serialize = "0.3"
71-
libc = "0.1"
67+
libc = "0.2"
7268
selectors = "0.2"
7369
smallvec = "0.1"
7470
string_cache = "0.2"
@@ -78,3 +74,4 @@ serde_macros = "0.6"
7874
serde_json = "0.5"
7975
unicode-bidi = "0.2"
8076
unicode-script = { version = "0.1", features = ["harfbuzz"] }
77+
url = "0.5"

‎components/layout_traits/Cargo.toml

+1-5
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,8 @@ path = "../util"
2828
[dependencies.ipc-channel]
2929
git = "https://github.com/servo/ipc-channel"
3030

31-
[dependencies.url]
32-
version = "0.2"
33-
features = [ "serde_serialization" ]
34-
3531
[dependencies]
3632
euclid = {version = "0.3", features = ["plugins"]}
3733
serde = "0.6"
3834
serde_macros = "0.6"
39-
35+
url = "0.5"

‎components/msg/Cargo.toml

+2-8
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ features = ["plugins"]
2424
git = "https://github.com/servo/rust-layers"
2525
features = ["plugins"]
2626

27-
[dependencies.hyper]
28-
version = "0.6"
29-
features = [ "serde-serialization" ]
30-
31-
[dependencies.url]
32-
version = "0.2.36"
33-
features = [ "serde_serialization" ]
34-
3527
[dependencies.ipc-channel]
3628
git = "https://github.com/servo/ipc-channel"
3729

@@ -45,10 +37,12 @@ path = "../plugins"
4537
[dependencies]
4638
app_units = {version = "0.1", features = ["plugins"]}
4739
bitflags = "0.3"
40+
hyper = { version = "0.7", features = [ "serde-serialization" ] }
4841
rustc-serialize = "0.3.4"
4942
euclid = {version = "0.3", features = ["plugins"]}
5043
serde = "0.6"
5144
serde_macros = "0.6"
45+
url = "0.5"
5246

5347
[target.x86_64-apple-darwin.dependencies]
5448
core-foundation = "0.1"

‎components/net/Cargo.toml

+4-10
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,21 @@ git = "https://github.com/ende76/brotli-rs"
2222
[dependencies.plugins]
2323
path = "../plugins"
2424

25-
[dependencies.hyper]
26-
version = "0.6"
27-
features = [ "serde-serialization" ]
28-
2925
[dependencies.msg]
3026
path = "../msg"
3127

3228
[dependencies.ipc-channel]
3329
git = "https://github.com/servo/ipc-channel"
3430

35-
[dependencies.url]
36-
version = "0.2"
37-
features = [ "serde_serialization" ]
38-
3931
[dependencies]
32+
hyper = { version = "0.7", features = [ "serde-serialization" ] }
4033
log = "0.3"
4134
time = "0.1.17"
42-
openssl="0.6.1"
35+
openssl = "0.7.0"
4336
rustc-serialize = "0.3"
44-
cookie = "0.1"
37+
cookie = "0.2"
4538
mime_guess = "1.1.1"
4639
flate2 = "0.2.0"
4740
uuid = "0.1.16"
4841
euclid = {version = "0.3", features = ["plugins"]}
42+
url = "0.5"

‎components/net/about_loader.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use mime_classifier::MIMEClassifier;
1010
use net_traits::ProgressMsg::Done;
1111
use net_traits::{LoadConsumer, LoadData, Metadata};
1212
use resource_task::{CancellationListener, send_error, start_sending_sniffed_opt};
13-
use std::fs::PathExt;
1413
use std::sync::Arc;
1514
use url::Url;
1615
use util::resource_files::resources_dir_path;

‎components/net_traits/Cargo.toml

+2-8
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,17 @@ path = "../msg"
1616
[dependencies.stb_image]
1717
git = "https://github.com/servo/rust-stb-image"
1818

19-
[dependencies.hyper]
20-
version = "0.6"
21-
features = [ "serde-serialization" ]
22-
2319
[dependencies.ipc-channel]
2420
git = "https://github.com/servo/ipc-channel"
2521

26-
[dependencies.url]
27-
version = "0.2"
28-
features = [ "serde_serialization" ]
29-
3022
[dependencies.plugins]
3123
path = "../plugins"
3224

3325
[dependencies]
3426
log = "0.3"
3527
euclid = {version = "0.3", features = ["plugins"]}
28+
hyper = { version = "0.7", features = [ "serde-serialization" ] }
3629
image = "0.4.0"
3730
serde = "0.6"
3831
serde_macros = "0.6"
32+
url = "0.5"

‎components/plugins/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ git = "https://github.com/Manishearth/rust-clippy"
1616
branch = "servo"
1717
optional = true
1818

19-
[dependencies.url]
20-
version = "0.2.36"
19+
[dependencies]
20+
url = "0.5"
2121

2222
[features]
2323
default = []

‎components/plugins/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//! - `#[dom_struct]` : Implies `#[privatize]`,`#[derive(JSTraceable)]`, and `#[must_root]`.
1414
//! Use this for structs that correspond to a DOM type
1515
16-
#![feature(plugin_registrar, quote, plugin, box_syntax, rustc_private)]
16+
#![feature(plugin_registrar, quote, plugin, box_syntax, rustc_private, slice_patterns)]
1717

1818
#[macro_use]
1919
extern crate syntax;

‎components/plugins/lints/inheritance_integrity.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ impl LintPass for InheritancePass {
2424
}
2525

2626
impl LateLintPass for InheritancePass {
27-
fn check_struct_def(&mut self, cx: &LateContext, def: &hir::StructDef, _n: ast::Name,
27+
fn check_struct_def(&mut self, cx: &LateContext, def: &hir::VariantData, _n: ast::Name,
2828
_gen: &hir::Generics, id: ast::NodeId) {
2929
// Lints are run post expansion, so it's fine to use
3030
// #[_dom_struct_marker] here without also checking for #[dom_struct]
3131
if cx.tcx.has_attr(cx.tcx.map.local_def_id(id), "_dom_struct_marker") {
3232
// Find the reflector, if any
33-
let reflector_span = def.fields.iter().enumerate()
33+
let reflector_span = def.fields().iter().enumerate()
3434
.find(|&(ctr, f)| {
3535
if match_lang_ty(cx, &*f.node.ty, "reflector") {
3636
if ctr > 0 {
@@ -44,7 +44,7 @@ impl LateLintPass for InheritancePass {
4444
})
4545
.map(|(_, f)| f.span);
4646
// Find all #[dom_struct] fields
47-
let dom_spans: Vec<_> = def.fields.iter().enumerate().filter_map(|(ctr, f)| {
47+
let dom_spans: Vec<_> = def.fields().iter().enumerate().filter_map(|(ctr, f)| {
4848
if let hir::TyPath(..) = f.node.ty.node {
4949
if let Some(&def::PathResolution { base_def: def::DefTy(def_id, _), .. }) =
5050
cx.tcx.def_map.borrow().get(&f.node.ty.id) {

‎components/plugins/lints/privatize.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ impl LintPass for PrivatizePass {
2525
impl LateLintPass for PrivatizePass {
2626
fn check_struct_def(&mut self,
2727
cx: &LateContext,
28-
def: &hir::StructDef,
28+
def: &hir::VariantData,
2929
_n: ast::Name,
3030
_gen: &hir::Generics,
3131
id: ast::NodeId) {
3232
if cx.tcx.has_attr(cx.tcx.map.local_def_id(id), "privatize") {
33-
for field in &def.fields {
33+
for field in def.fields() {
3434
match field.node {
3535
hir::StructField_ { kind: hir::NamedField(name, visibility), .. } if visibility == hir::Public => {
3636
cx.span_lint(PRIVATIZE, field.span,

‎components/plugins/lints/unrooted_must_root.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl LateLintPass for UnrootedPass {
8080
/// All structs containing #[must_root] types must be #[must_root] themselves
8181
fn check_struct_def(&mut self,
8282
cx: &LateContext,
83-
def: &hir::StructDef,
83+
def: &hir::VariantData,
8484
_n: ast::Name,
8585
_gen: &hir::Generics,
8686
id: ast::NodeId) {
@@ -89,7 +89,7 @@ impl LateLintPass for UnrootedPass {
8989
_ => cx.tcx.map.expect_item(cx.tcx.map.get_parent(id)),
9090
};
9191
if item.attrs.iter().all(|a| !a.check_name("must_root")) {
92-
for ref field in &def.fields {
92+
for ref field in def.fields() {
9393
if is_unrooted_ty(cx, cx.tcx.node_id_to_type(field.node.id), false) {
9494
cx.span_lint(UNROOTED_MUST_ROOT, field.span,
9595
"Type must be rooted, use #[must_root] on the struct definition to propagate")
@@ -101,13 +101,13 @@ impl LateLintPass for UnrootedPass {
101101
/// All enums containing #[must_root] types must be #[must_root] themselves
102102
fn check_variant(&mut self, cx: &LateContext, var: &hir::Variant, _gen: &hir::Generics) {
103103
let ref map = cx.tcx.map;
104-
if map.expect_item(map.get_parent(var.node.id)).attrs.iter().all(|a| !a.check_name("must_root")) {
105-
match var.node.kind {
106-
hir::TupleVariantKind(ref vec) => {
104+
if map.expect_item(map.get_parent(var.node.data.id())).attrs.iter().all(|a| !a.check_name("must_root")) {
105+
match var.node.data {
106+
hir::VariantData::Tuple(ref vec, _) => {
107107
for ty in vec {
108-
cx.tcx.ast_ty_to_ty_cache.borrow().get(&ty.id).map(|t| {
108+
cx.tcx.ast_ty_to_ty_cache.borrow().get(&ty.node.id).map(|t| {
109109
if is_unrooted_ty(cx, t, false) {
110-
cx.span_lint(UNROOTED_MUST_ROOT, ty.ty.span,
110+
cx.span_lint(UNROOTED_MUST_ROOT, ty.node.ty.span,
111111
"Type must be rooted, use #[must_root] on \
112112
the enum definition to propagate")
113113
}

‎components/plugins/reflector.rs

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

0 commit comments

Comments
 (0)