Upgrade to rustc 058242141b54bf9e9b82caf02a39c4b9083023c1 2014-07-16

Author: metajack

color.rs

@@ -205,10 +205,10 @@ fn parse_color_hash(value: &str) -> Option<Color> {
     macro_rules! from_hex(
         ($c: expr) => {{
             let c = $c;
-            match c as char {
-                '0' .. '9' => c - ('0' as u8),
-                'a' .. 'f' => c - ('a' as u8) + 10,
-                'A' .. 'F' => c - ('A' as u8) + 10,
+            match c {
+                '0' .. '9' => c as u8 - ('0' as u8),
+                'a' .. 'f' => c as u8 - ('a' as u8) + 10,
+                'A' .. 'F' => c as u8 - ('A' as u8) + 10,
                 _ => return None  // Not a valid color
             }
         }};
@@ -224,14 +224,14 @@ fn parse_color_hash(value: &str) -> Option<Color> {
 
     match value.len() {
         6 => to_rgba!(
-            from_hex!(value[0]) * 16 + from_hex!(value[1]),
-            from_hex!(value[2]) * 16 + from_hex!(value[3]),
-            from_hex!(value[4]) * 16 + from_hex!(value[5]),
+            from_hex!(value.char_at(0)) * 16 + from_hex!(value.char_at(1)),
+            from_hex!(value.char_at(2)) * 16 + from_hex!(value.char_at(3)),
+            from_hex!(value.char_at(4)) * 16 + from_hex!(value.char_at(5)),
         ),
         3 => to_rgba!(
-            from_hex!(value[0]) * 17,
-            from_hex!(value[1]) * 17,
-            from_hex!(value[2]) * 17,
+            from_hex!(value.char_at(0)) * 17,
+            from_hex!(value.char_at(1)) * 17,
+            from_hex!(value.char_at(2)) * 17,
         ),
         _ => None
     }

css-parsing-tests/color3.json

@@ -33,6 +33,8 @@
 "#FFCc99", [1, 0.8, 0.6, 1],
 "#369", [0.2, 0.4, 0.6, 1],
 
+ "#ffé", null, "#fffffé", null,
+
 "rgb(00, 51, 102)", [0, 0.2, 0.4, 1],
 "r\\gb(00, 51, 102)", [0, 0.2, 0.4, 1],
 "r\\67 b(00, 51, 102)", [0, 0.2, 0.4, 1],

from_bytes.rs

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use std::cmp;
-use std::str;
 
 use encoding::label::encoding_from_whatwg_label;
 use encoding::all::UTF_8;
@@ -50,7 +49,7 @@ pub fn decode_stylesheet_bytes(css: &[u8], protocol_encoding_label: Option<&str>
             Some(label_length)
             => if css.slice_from(10 + label_length).starts_with("\";".as_bytes()) {
                 let label = css.slice(10, 10 + label_length);
-                let label = str::from_chars(label.iter().map(|&b| b as char).collect::<Vec<char>>().as_slice());
+                let label = String::from_chars(label.iter().map(|&b| b as char).collect::<Vec<char>>().as_slice());
                 match encoding_from_whatwg_label(label.as_slice()) {
                     None => (),
                     Some(fallback) => match fallback.name() {

lib.rs

@@ -2,7 +2,7 @@
  * 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/. */
 
-#![crate_id = "github.com/mozilla-servo/rust-cssparser#cssparser:0.1"]
+#![crate_name = "cssparser"]
 #![crate_type = "lib"]
 #![crate_type = "dylib"]
 #![crate_type = "rlib"]

tests.rs

@@ -2,8 +2,9 @@
  * 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/. */
 
-use std::{io, str, task};
+use std::io;
 use std::io::{File, Command, Writer, TempDir};
+use std::task;
 use serialize::{json};
 use serialize::json::ToJson;
 use test;
@@ -49,7 +50,9 @@ fn assert_json_eq(results: json::Json, expected: json::Json, message: String) {
         let temp = TempDir::new("rust-cssparser-tests").unwrap();
         let results = results.to_pretty_str().append("\n");
         let expected = expected.to_pretty_str().append("\n");
-        task::try(proc() {
+        // NB: The task try is to prevent error message generation from
+        // stopping us, we don't care about the result.
+        let _ = task::try(proc() {
             let mut result_path = temp.path().clone();
             result_path.push("results.json");
             let mut expected_path = temp.path().clone();
@@ -58,10 +61,10 @@ fn assert_json_eq(results: json::Json, expected: json::Json, message: String) {
             write_whole_file(&expected_path, expected.as_slice());
             Command::new("colordiff")
                 .arg("-u1000")
-                .arg(result_path.display().to_str())
-                .arg(expected_path.display().to_str())
-                .status().unwrap();
-        }).unwrap();
+                .arg(result_path.display().to_string())
+                .arg(expected_path.display().to_string())
+                .status().unwrap()
+        });
 
         fail!(message)
     }
@@ -166,20 +169,20 @@ fn stylesheet_from_bytes() {
         };
 
         let result = {
-            let css = get_string(map, &"css_bytes".to_string()).unwrap().chars().map(|c| {
+            let css = get_string(&map, &"css_bytes".to_string()).unwrap().chars().map(|c| {
                 assert!(c as u32 <= 0xFF);
                 c as u8
             }).collect::<Vec<u8>>();
-            let protocol_encoding_label = get_string(map, &"protocol_encoding".to_string());
-            let environment_encoding = get_string(map, &"environment_encoding".to_string())
+            let protocol_encoding_label = get_string(&map, &"protocol_encoding".to_string());
+            let environment_encoding = get_string(&map, &"environment_encoding".to_string())
                 .and_then(encoding_from_whatwg_label);
 
             let (mut rules, used_encoding) = parse_stylesheet_rules_from_bytes(
                 css.as_slice(), protocol_encoding_label, environment_encoding);
 
             (rules.collect::<Vec<Result<Rule, SyntaxError>>>(), used_encoding.name().to_string()).to_json()
         };
-        assert_json_eq(result, expected, json::Object(map).to_str());
+        assert_json_eq(result, expected, json::Object(map).to_string());
     });
 
     fn get_string<'a>(map: &'a json::Object, key: &String) -> Option<&'a str> {
@@ -410,7 +413,7 @@ impl ToJson for ComponentValue {
             String(ref value) => JList!(JString!("string"), value.to_json()),
             URL(ref value) => JList!(JString!("url"), value.to_json()),
             Delim('\\') => JString!("\\"),
-            Delim(value) => json::String(str::from_char(value)),
+            Delim(value) => json::String(String::from_char(1, value)),
 
             Number(ref value) => json::List(vec!(JString!("number")) + numeric(value)),
             Percentage(ref value) => json::List(vec!(JString!("percentage")) + numeric(value)),