diff --git a/ll.rs b/ll.rs index e389b39..993e848 100644 --- a/ll.rs +++ b/ll.rs @@ -34,8 +34,8 @@ pub struct lwc_string { insensitive: *lwc_string } -pub extern { - fn lwc_intern_string(s: *c_char, slen: size_t, ret: *mut *lwc_string) -> lwc_error; - fn rust_lwc_string_ref(s: *lwc_string); - fn rust_lwc_string_unref(s: *lwc_string); +extern { + pub fn lwc_intern_string(s: *c_char, slen: size_t, ret: *mut *lwc_string) -> lwc_error; + pub fn rust_lwc_string_ref(s: *lwc_string); + pub fn rust_lwc_string_unref(s: *lwc_string); } diff --git a/wapcaplet.rc b/wapcaplet.rc index c2f6cd6..14210dd 100644 --- a/wapcaplet.rc +++ b/wapcaplet.rc @@ -44,7 +44,7 @@ impl Drop for LwcString { pub fn from_rust_string(s: &str) -> LwcString { unsafe { let mut interned_string = null(); - do str::as_c_str(s) |cs| { + do s.as_c_str |cs| { let code = lwc_intern_string(cs, s.len() as size_t, to_mut_unsafe_ptr(&mut interned_string)); @@ -118,10 +118,9 @@ fn smoke_test() { #[test] fn multithreading_test() { use std::task; - use std::uint; use std::vec; - for uint::range(0, 100) |i| { - for 50.times { + for i in range(0, 100) { + for _ in range(0, 50) { do task::spawn { let s = vec::from_elem(i + 1, 0).to_str(); let s = from_rust_string(s);