Upgrade to rustc 0.13.0-nightly (0669a432a 2014-12-15 22:11:44 +0000)

Author: SimonSapin

src/tests.rs

@@ -444,10 +444,13 @@ impl ToJson for ComponentValue {
             Delim('\\') => JString!("\\"),
             Delim(value) => Json::String(String::from_char(1, value)),
 
-            Number(ref value) => Json::Array(vec!(JString!("number")) + numeric(value)),
-            Percentage(ref value) => Json::Array(vec!(JString!("percentage")) + numeric(value)),
+            Number(ref value) => Json::Array(
+                vec!(JString!("number")) + numeric(value).as_slice()),
+            Percentage(ref value) => Json::Array(
+                vec!(JString!("percentage")) + numeric(value).as_slice()),
             Dimension(ref value, ref unit) => Json::Array(
-                vec!(JString!("dimension")) + numeric(value) + [unit.to_json()].as_slice()),
+                vec!(JString!("dimension")) + numeric(value).as_slice()
+                + [unit.to_json()].as_slice()),
 
             UnicodeRange(start, end)
             => JArray!(JString!("unicode-range"), start.to_json(), end.to_json()),
@@ -466,14 +469,19 @@ impl ToJson for ComponentValue {
             CDC => JString!("-->"),
 
             Function(ref name, ref arguments)
-            => Json::Array(vec!(JString!("function"), name.to_json()) +
-                     arguments.iter().map(|a| a.to_json()).collect::<Vec<json::Json>>()),
+            => Json::Array(
+                vec!(JString!("function"), name.to_json())
+                + arguments.iter().map(|a| a.to_json()).collect::<Vec<json::Json>>().as_slice()),
             ParenthesisBlock(ref content)
-            => Json::Array(vec!(JString!("()")) + content.iter().map(|c| c.to_json()).collect::<Vec<json::Json>>()),
+            => Json::Array(
+                vec!(JString!("()"))
+                + content.iter().map(|c| c.to_json()).collect::<Vec<json::Json>>().as_slice()),
             SquareBracketBlock(ref content)
-            => Json::Array(vec!(JString!("[]")) + content.iter().map(|c| c.to_json()).collect::<Vec<json::Json>>()),
+            => Json::Array(
+                vec!(JString!("[]"))
+                + content.iter().map(|c| c.to_json()).collect::<Vec<json::Json>>().as_slice()),
             CurlyBracketBlock(ref content)
-            => Json::Array(vec!(JString!("{}")) + list_to_json(content)),
+            => Json::Array(vec!(JString!("{}")) + list_to_json(content).as_slice()),
 
             BadURL => JArray!(JString!("error"), JString!("bad-url")),
             BadString => JArray!(JString!("error"), JString!("bad-string")),

src/tokenizer.rs

@@ -554,13 +554,16 @@ fn consume_unicode_range(tokenizer: &mut Tokenizer) -> ComponentValue {
         question_marks += 1;
         tokenizer.position += 1
     }
+    let first: u32 = if hex.len() > 0 {
+        num::from_str_radix(hex.as_slice(), 16).unwrap()
+    } else { 0 };
     let start;
     let end;
     if question_marks > 0 {
-        start = num::from_str_radix((hex + "0".repeat(question_marks)).as_slice(), 16).unwrap();
-        end = num::from_str_radix((hex + "F".repeat(question_marks)).as_slice(), 16).unwrap();
+        start = first << (question_marks * 4);
+        end = ((first + 1) << (question_marks * 4)) - 1;
     } else {
-        start = num::from_str_radix(hex.as_slice(), 16).unwrap();
+        start = first;
         hex.truncate(0);
         if !tokenizer.is_eof() && tokenizer.current_char() == '-' {
             tokenizer.position += 1;