Auto merge of #6850 - servo:rustup_2015-07-30, r=SimonSapin

Upgrade to rustc 1.3.0-dev (87055a68c 2015-07-30)

This builds and passes unit tests.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6850)
<!-- Reviewable:end -->

components/script/Cargo.toml

@@ -80,7 +80,7 @@ websocket = "0.12"
 uuid = "0.1.16"
 smallvec = "0.1"
 html5ever = "0.2"
-string_cache = "0.1"
+string_cache = { version = "0.1.9", features = ["unstable"] }
 string_cache_plugin = "0.1"
 euclid = "0.1"
 tendril = "0.1.1"

components/script/dom/bindings/utils.rs

@@ -381,8 +381,8 @@ pub type ProtoOrIfaceArray = [*mut JSObject; PrototypeList::ID::Count as usize];
 /// Construct and cache the ProtoOrIfaceArray for the given global.
 /// Fails if the argument is not a DOM global.
 pub fn initialize_global(global: *mut JSObject) {
-    let proto_array: Box<ProtoOrIfaceArray> = box ()
-        ([0 as *mut JSObject; PrototypeList::ID::Count as usize]);
+    let proto_array: Box<ProtoOrIfaceArray> =
+        box [0 as *mut JSObject; PrototypeList::ID::Count as usize];
     unsafe {
         assert!(((*JS_GetClass(global)).flags & JSCLASS_DOM_GLOBAL) != 0);
         let box_ = Box::into_raw(proto_array);

components/script/dom/document.rs

@@ -1430,7 +1430,7 @@ impl<'a> DocumentMethods for &'a Document {
             Some(ref title) => {
                 // Steps 3-4.
                 let value = Node::collect_text_contents(title.r().children());
-                split_html_space_chars(&value).collect::<Vec<_>>().connect(" ")
+                split_html_space_chars(&value).collect::<Vec<_>>().join(" ")
             },
         }
     }

components/script/dom/htmlbuttonelement.rs

@@ -22,7 +22,7 @@ use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeTypeId, document_fr
 use dom::validitystate::ValidityState;
 use dom::virtualmethods::VirtualMethods;
 
-use std::ascii::OwnedAsciiExt;
+use std::ascii::AsciiExt;
 use std::borrow::ToOwned;
 use util::str::DOMString;
 use std::cell::Cell;
@@ -87,7 +87,8 @@ impl<'a> HTMLButtonElementMethods for &'a HTMLButtonElement {
     // https://html.spec.whatwg.org/multipage/#dom-button-type
     fn Type(self) -> DOMString {
         let elem = ElementCast::from_ref(self);
-        let ty = elem.get_string_attribute(&atom!("type")).into_ascii_lowercase();
+        let mut ty = elem.get_string_attribute(&atom!("type"));
+        ty.make_ascii_lowercase();
         // https://html.spec.whatwg.org/multipage/#attr-button-type
         match &*ty {
             "reset" | "button" | "menu" => ty,

components/script/dom/htmlformelement.rs

@@ -35,7 +35,6 @@ use hyper::mime;
 use msg::constellation_msg::LoadData;
 use util::str::DOMString;
 use script_task::{ScriptChan, ScriptMsg};
-use std::ascii::OwnedAsciiExt;
 use url::UrlParser;
 use url::form_urlencoded::serialize;
 use string_cache::Atom;

components/script/dom/htmlinputelement.rs

@@ -38,7 +38,6 @@ use msg::constellation_msg::ConstellationChan;
 use util::str::DOMString;
 use string_cache::Atom;
 
-use std::ascii::OwnedAsciiExt;
 use std::borrow::ToOwned;
 use std::cell::Cell;
 

components/script/dom/htmloptionelement.rs

@@ -88,7 +88,7 @@ impl<'a> HTMLOptionElementMethods for &'a HTMLOptionElement {
         let mut content = String::new();
         collect_text(&node, &mut content);
         let v: Vec<&str> = split_html_space_chars(&content).collect();
-        v.connect(" ")
+        v.join(" ")
     }
 
     // https://www.whatwg.org/html/#dom-option-text

components/script/dom/macros.rs

@@ -104,9 +104,10 @@ macro_rules! make_enumerated_getter(
             use dom::bindings::codegen::InheritTypes::ElementCast;
             use string_cache::Atom;
             use std::borrow::ToOwned;
+            use std::ascii::AsciiExt;
             let element = ElementCast::from_ref(self);
-            let val = element.get_string_attribute(&Atom::from_slice($htmlname))
-                             .into_ascii_lowercase();
+            let mut val = element.get_string_attribute(&Atom::from_slice($htmlname));
+            val.make_ascii_lowercase();
             // https://html.spec.whatwg.org/multipage/#attr-fs-method
             match &*val {
                 $($choices)|+ => val,

components/script/lib.rs

@@ -4,6 +4,7 @@
 
 #![feature(append)]
 #![feature(arc_unique)]
+#![feature(ascii)]
 #![feature(as_slice)]
 #![feature(as_unsafe_cell)]
 #![feature(borrow_state)]
@@ -17,7 +18,6 @@
 #![feature(hashmap_hasher)]
 #![feature(mpsc_select)]
 #![feature(nonzero)]
-#![feature(owned_ascii_ext)]
 #![feature(plugin)]
 #![feature(ref_slice)]
 #![feature(rc_unique)]

components/script/script_task.rs

@@ -1099,7 +1099,7 @@ impl ScriptTask {
         for it_page in self.root_page().iter() {
             urls.push(it_page.document().url().serialize());
         }
-        let path_seg = format!("url({})", urls.connect(", "));
+        let path_seg = format!("url({})", urls.join(", "));
         let reports = ScriptTask::get_reports(self.get_cx(), path_seg);
         reports_chan.send(reports);
     }