diff --git a/README.md b/README.md index 0ad7dda2854..6c3dab47a48 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: 94f05c1 +* Last known-good Rust commit: 13c01dd [rust]: http://www.rust-lang.org diff --git a/src/rust-glut b/src/rust-glut index 9b8febc24a9..51e8805aedd 160000 --- a/src/rust-glut +++ b/src/rust-glut @@ -1 +1 @@ -Subproject commit 9b8febc24a910dd3b6e905f85ebf9808ff8ec905 +Subproject commit 51e8805aedd9ba7d4b3c7f794741d4a0a9b225e7 diff --git a/src/rust-mozjs b/src/rust-mozjs index cdedc9a50d0..95f701540d9 160000 --- a/src/rust-mozjs +++ b/src/rust-mozjs @@ -1 +1 @@ -Subproject commit cdedc9a50d0c59de945867c72f15e9694f7a73e9 +Subproject commit 95f701540d9b7171d46d041095bbe583710b4e2d diff --git a/src/servo/dom/bindings/utils.rs b/src/servo/dom/bindings/utils.rs index 6b0953d76b0..09c82276536 100644 --- a/src/servo/dom/bindings/utils.rs +++ b/src/servo/dom/bindings/utils.rs @@ -95,7 +95,7 @@ extern fn has_instance(_cx: *JSContext, obj: **JSObject, v: *JSVal, bp: *mut JSB return 1; } -pub fn prototype_jsclass(name: ~str) -> fn(compartment: &bare_compartment) -> JSClass { +pub fn prototype_jsclass(name: ~str) -> @fn(compartment: &bare_compartment) -> JSClass { |compartment: &bare_compartment, move name| { {name: compartment.add_name(copy name), flags: 0, @@ -124,7 +124,7 @@ pub fn prototype_jsclass(name: ~str) -> fn(compartment: &bare_compartment) -> JS } pub fn instance_jsclass(name: ~str, finalize: *u8) - -> fn(compartment: &bare_compartment) -> JSClass { + -> @fn(compartment: &bare_compartment) -> JSClass { |compartment: &bare_compartment, move name| { {name: compartment.add_name(copy name), flags: JSCLASS_HAS_RESERVED_SLOTS(1),