From 9319a352cf42d75f9f19dfc1ef28e0fbe9c40474 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <kmcallister@mozilla.com>
Date: Tue, 13 Aug 2013 11:06:23 -0700
Subject: [PATCH 1/2] Update tests for new Rust

---
 test.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test.rs b/test.rs
index 54d3d13..f180f35 100644
--- a/test.rs
+++ b/test.rs
@@ -86,7 +86,7 @@ mod example1 {
         debug!("count sheets: %?", select_ctx.count_sheets());
         assert!(select_ctx.count_sheets() == 1);
 
-        for hh in range(1, 7) {
+        for hh in range(1u, 7u) {
             let element = fmt!("h%u", hh);
             let element_name: @LwcString = @from_rust_string(element);
             let node = MyDomNode { name: element_name };
@@ -164,7 +164,7 @@ mod example1 {
 
 #[test]
 fn test_arc() {
-    use extra::arc::ARC;
+    use extra::arc::Arc;
     use stylesheet::*;
     use types::CssLevel21;
     use wapcaplet::LwcString;
@@ -186,7 +186,7 @@ fn test_arc() {
     };
 
     let sheet: CssStylesheet = css_stylesheet_create(&params);
-    let _arc = ARC(sheet);
+    let _arc = Arc::new(sheet);
 
     fn resolve_url(_base: &str, _rel: &LwcString) -> CssResult<LwcString> {
         fail!(~"resolving url");

From 131390c450fc08620a9b7f654e373cf8bb8d8d27 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <kmcallister@mozilla.com>
Date: Tue, 13 Aug 2013 14:04:19 -0700
Subject: [PATCH 2/2] Update to latest Rust

---
 conversions.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/conversions.rs b/conversions.rs
index d3304d8..62bd50f 100644
--- a/conversions.rs
+++ b/conversions.rs
@@ -38,7 +38,7 @@ pub trait AsLl<T> {
 }
 
 impl ToLl<css_language_level> for CssLanguageLevel {
-    pub fn to_ll(&self) -> css_language_level {
+    fn to_ll(&self) -> css_language_level {
         match *self {
             CssLevel1 => CSS_LEVEL_1,
             CssLevel2 => CSS_LEVEL_2,
@@ -51,19 +51,19 @@ impl ToLl<css_language_level> for CssLanguageLevel {
 }
 
 impl ToLl<css_error> for CssError {
-    pub fn to_ll(&self) -> css_error {
+    fn to_ll(&self) -> css_error {
         *self as css_error
     }
 }
 
 impl ToLl<css_font_family_e> for CssFontFamily {
-    pub fn to_ll(&self) -> css_font_family_e {
+    fn to_ll(&self) -> css_font_family_e {
         *self as css_font_family_e
     }
 }
 
 impl ToLl<css_color> for CssColor {
-    pub fn to_ll(&self) -> css_color {
+    fn to_ll(&self) -> css_color {
         assert!(sys::size_of::<CssColor>() == sys::size_of::<css_color>());
         unsafe { transmute(*self) }
     }
@@ -75,7 +75,7 @@ pub fn ll_color_to_hl_color(color: css_color) -> CssColor {
 }
 
 impl ToLl<(css_unit, css_fixed)> for CssUnit {
-    pub fn to_ll(&self) -> (css_unit, css_fixed) {
+    fn to_ll(&self) -> (css_unit, css_fixed) {
         use ll::types::*;
         use types::*;
         match *self {
@@ -156,7 +156,7 @@ pub fn ll_qname_to_hl_qname(qname: *css_qname) -> CssQName {
 }
 
 impl ToLl<css_pseudo_element> for CssPseudoElement {
-    pub fn to_ll(&self) -> css_pseudo_element {
+    fn to_ll(&self) -> css_pseudo_element {
         *self as css_pseudo_element
     }
 }
@@ -168,7 +168,7 @@ pub fn c_enum_to_rust_enum<T>(val: c_enum) -> T {
 }
 
 impl AsLl<css_stylesheet_params> for CssStylesheetParams {
-    pub fn as_ll<U>(&self, f: &fn(&css_stylesheet_params) -> U) -> U {
+    fn as_ll<U>(&self, f: &fn(&css_stylesheet_params) -> U) -> U {
         do self.charset.to_c_str().with_ref |charset| {
             do self.url.to_c_str().with_ref |url| {
                 do self.title.to_c_str().with_ref |title| {