auto merge of #1473 : metajack/servo/rustup-20131219, r=jdm

1 files changed, 1 insertions, 5 deletions

diff --git a/src/components/script/dom/bindings/proxyhandler.rs b/src/components/script/dom/bindings/proxyhandler.rs
index 5201b724070..2f8267d4f29 100644
--- a/src/components/script/dom/bindings/proxyhandler.rs
+++ b/src/components/script/dom/bindings/proxyhandler.rs
@@ -44,7 +44,6 @@ pub extern fn getPropertyDescriptor(cx: *JSContext, proxy: *JSObject, id: jsid,
   }
 }
 
-#[fixed_stack_segment]
 pub fn defineProperty_(cx: *JSContext, proxy: *JSObject, id: jsid,
                        desc: *JSPropertyDescriptor) -> JSBool {
     unsafe {
@@ -72,7 +71,6 @@ pub extern fn defineProperty(cx: *JSContext, proxy: *JSObject, id: jsid,
     defineProperty_(cx, proxy, id, desc)
 }
 
-#[fixed_stack_segment]
 pub fn _obj_toString(cx: *JSContext, className: *libc::c_char) -> *JSString {
   unsafe {
     let name = str::raw::from_c_str(className);
@@ -83,7 +81,7 @@ pub fn _obj_toString(cx: *JSContext, className: *libc::c_char) -> *JSString {
     }
 
     let result = ~"[object " + name + "]";
-    for (i, c) in result.iter().enumerate() {
+    for (i, c) in result.chars().enumerate() {
       *chars.offset(i as int) = c as jschar;
     }
     *chars.offset(nchars as int) = 0;
@@ -95,7 +93,6 @@ pub fn _obj_toString(cx: *JSContext, className: *libc::c_char) -> *JSString {
   }
 }
 
-#[fixed_stack_segment]
 pub fn GetExpandoObject(obj: *JSObject) -> *JSObject {
     unsafe {
         assert!(is_dom_proxy(obj));
@@ -108,7 +105,6 @@ pub fn GetExpandoObject(obj: *JSObject) -> *JSObject {
     }
 }
 
-#[fixed_stack_segment]
 pub fn EnsureExpandoObject(cx: *JSContext, obj: *JSObject) -> *JSObject {
     unsafe {
         assert!(is_dom_proxy(obj));