From 1339163907ebbf00ec4f73936118b961492425d7 Mon Sep 17 00:00:00 2001 From: "Brian J. Burg" Date: Thu, 8 Nov 2012 16:54:11 -0800 Subject: [PATCH] Update Rust to commit 1702024 --- README.md | 2 +- src/servo/dom/bindings/utils.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6c3dab47a48..2449c20a4c9 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ against a released version of Rust will not work, nor will the Rust 'master' branch. The commit below will *probably* work. If it does not then the topic in #servo might know better. -* Last known-good Rust commit: 13c01dd +* Last known-good Rust commit: 17020244e4 [rust]: http://www.rust-lang.org diff --git a/src/servo/dom/bindings/utils.rs b/src/servo/dom/bindings/utils.rs index 09c82276536..da08350b775 100644 --- a/src/servo/dom/bindings/utils.rs +++ b/src/servo/dom/bindings/utils.rs @@ -55,8 +55,8 @@ fn jsval_to_str(cx: *JSContext, v: JSVal) -> Result<~str, ()> { } } -unsafe fn domstring_to_jsval(cx: *JSContext, str: &DOMString) -> JSVal { - match *str { +unsafe fn domstring_to_jsval(cx: *JSContext, string: &DOMString) -> JSVal { + match *string { null_string => { JSVAL_NULL }