From cb356cbcc419fc02bdef32941a7af48b05fa3697 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Sat, 13 Oct 2012 00:47:09 -0700
Subject: [PATCH] Update for library changes (current Rust commit
 57b4d10ff652d3beddae64782c882a07822bac3c)

---
 src/servo/dom/bindings/utils.rs |  2 +-
 src/servo/gfx/png_compositor.rs |  1 -
 src/servo/layout/inline.rs      |  2 +-
 src/servo/text/util.rs          | 10 +++++-----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/servo/dom/bindings/utils.rs b/src/servo/dom/bindings/utils.rs
index 7c090965450..6f8b1cb80f2 100644
--- a/src/servo/dom/bindings/utils.rs
+++ b/src/servo/dom/bindings/utils.rs
@@ -49,7 +49,7 @@ fn jsval_to_str(cx: *JSContext, v: jsval) -> Result<~str, ()> {
         Err(())
     } else {
         unsafe {
-            let buf = vec::raw::from_buf(chars as *u8, len as uint);
+            let buf = vec::raw::from_buf_raw(chars as *u8, len as uint);
             Ok(str::from_bytes(buf))
         }
     }
diff --git a/src/servo/gfx/png_compositor.rs b/src/servo/gfx/png_compositor.rs
index 71af56f243f..5696e4945a8 100644
--- a/src/servo/gfx/png_compositor.rs
+++ b/src/servo/gfx/png_compositor.rs
@@ -20,7 +20,6 @@ use render_task::{RenderTask, RenderMsg};
 use task::spawn_listener;
 use comm::{Chan, Port};
 use cast::reinterpret_cast;
-use vec_from_buf = vec::raw::from_buf;
 use ptr::addr_of;
 use dom::event::Event;
 use dvec::DVec;
diff --git a/src/servo/layout/inline.rs b/src/servo/layout/inline.rs
index 9386e1c62b4..9d0ee698558 100644
--- a/src/servo/layout/inline.rs
+++ b/src/servo/layout/inline.rs
@@ -209,7 +209,7 @@ impl TextRunScanner {
                 // TODO: use a rope, simply give ownership of  nonzero strs to rope
                 let mut run_str : ~str = ~"";
                 for uint::range(0, transformed_strs.len()) |i| {
-                    str::push_str(&run_str, transformed_strs[i]);
+                    str::push_str(&mut run_str, transformed_strs[i]);
                 }
                 
                 // TODO: use actual font for corresponding DOM node to create text run.
diff --git a/src/servo/text/util.rs b/src/servo/text/util.rs
index 4456ab81fbb..129c185c5b8 100644
--- a/src/servo/text/util.rs
+++ b/src/servo/text/util.rs
@@ -28,7 +28,7 @@ impl CompressionMode : cmp::Eq {
 // * record skipped and kept chars for mapping original to new text
 // * various edge cases for bidi, CJK, combining char seqs, etc.
 pub fn transform_text(text: &str, mode: CompressionMode) -> ~str {
-    let out_str: ~str = ~"";
+    let mut out_str: ~str = ~"";
     match mode {
         CompressNone | DiscardNewline => {
             for str::each_char(text) |ch: char| {
@@ -39,7 +39,7 @@ pub fn transform_text(text: &str, mode: CompressionMode) -> ~str {
                     if ch == '\t' {
                         // TODO: set "has tab" flag
                     }
-                    str::push_char(&out_str, ch);
+                    str::push_char(&mut out_str, ch);
                 }
             }
         },
@@ -65,14 +65,14 @@ pub fn transform_text(text: &str, mode: CompressionMode) -> ~str {
                         // TODO: record skipped char
                     } else {
                         // TODO: record kept char
-                        str::push_char(&out_str, ch);
+                        str::push_char(&mut out_str, ch);
                     }
                 } else { /* next_in_whitespace; possibly add a space char */
                     if in_whitespace {
                         // TODO: record skipped char
                     } else {
                         // TODO: record kept char
-                        str::push_char(&out_str, ' ');
+                        str::push_char(&mut out_str, ' ');
                     }
                 }
                 // save whitespace context for next char
@@ -220,4 +220,4 @@ fn test_transform_compress_whitespace_newline() {
     for uint::range(0, test_strs.len()) |i| {
         assert transform_text(test_strs[i], mode) == oracle_strs[i];
     }
-}
\ No newline at end of file
+}