From 65e48d2975efec29ff12202c40a02672f2eda3ac Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Tue, 6 Aug 2013 10:06:33 -0700 Subject: [PATCH] Update to latest Rust --- hubbub.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hubbub.rs b/hubbub.rs index 4e2b94c..f451555 100644 --- a/hubbub.rs +++ b/hubbub.rs @@ -13,7 +13,6 @@ use std::cast; use std::libc; use std::libc::{c_void, size_t}; use std::ptr::{null, to_unsafe_ptr}; -use std::str; use std::vec; use ll; @@ -96,7 +95,7 @@ impl Drop for Parser { pub fn Parser(encoding: &str, fix_encoding: bool) -> Parser { let hubbub_parser = null(); - let hubbub_error = do str::as_c_str(encoding) |encoding_c: *libc::c_char| { + let hubbub_error = do encoding.as_c_str |encoding_c: *libc::c_char| { unsafe { ll::parser::hubbub_parser_create(cast::transmute(encoding_c), fix_encoding, allocator, null(), to_unsafe_ptr(&hubbub_parser)) @@ -260,7 +259,7 @@ pub mod tree_callbacks { debug!("from_hubbub_attributes n=%u", n_attributes as uint); unsafe { do vec::from_fn(n_attributes as uint) |i| { - let attribute = offset(attributes, i); + let attribute = offset(attributes, i as int); Attribute { ns: from_hubbub_ns((*attribute).ns), name: from_hubbub_string(&(*attribute).name),