diff --git a/conversions.rs b/conversions.rs index 9fe006c..d3304d8 100644 --- a/conversions.rs +++ b/conversions.rs @@ -169,9 +169,9 @@ pub fn c_enum_to_rust_enum(val: c_enum) -> T { impl AsLl for CssStylesheetParams { pub fn as_ll(&self, f: &fn(&css_stylesheet_params) -> U) -> U { - do self.charset.as_c_str |charset| { - do self.url.as_c_str |url| { - do self.title.as_c_str |title| { + do self.charset.to_c_str().with_ref |charset| { + do self.url.to_c_str().with_ref |url| { + do self.title.to_c_str().with_ref |title| { let params = css_stylesheet_params { params_version: self.params_version as uint32_t, level: self.level.to_ll(), diff --git a/netsurfcss.rc b/netsurfcss.rc index e8400c4..32315a0 100644 --- a/netsurfcss.rc +++ b/netsurfcss.rc @@ -566,11 +566,11 @@ pub mod hint { #[cfg(target_arch = "arm")] fn status_field_offset() -> int { 16 } - priv fn hint_data_field(llhint: *mut css_hint) -> &mut T { + fn hint_data_field(llhint: *mut css_hint) -> &mut T { unsafe { transmute(llhint) } } - priv fn hint_imm_data_field(llhint: *css_hint) -> &T { + fn hint_imm_data_field(llhint: *css_hint) -> &T { unsafe { transmute(llhint) } } } @@ -683,7 +683,7 @@ pub mod select { } } - priv fn build_raw_handler() -> css_select_handler { + fn build_raw_handler() -> css_select_handler { css_select_handler { handler_version: CSS_SELECT_HANDLER_VERSION_1, node_name: raw_handler::node_name, @@ -724,7 +724,7 @@ pub mod select { } } - priv mod raw_handler { + mod raw_handler { use std::libc::types::common::c99::{uint32_t, int32_t}; use wapcaplet::ll::lwc_string; use ll::types::css_qname; @@ -738,16 +738,16 @@ pub mod select { use hint::CssHint; use super::UntypedHandler; - priv fn unimpl(n: &str) -> ! { + fn unimpl(n: &str) -> ! { fail!(fmt!("unimplemented css callback handler: %s", n)) } fn unimpl_warn(what: &str) { warn!("unimplemented css value: %?", what); } - priv fn enter(n: &str) { + fn enter(n: &str) { debug!("entering raw handler: %s", n); } - priv fn ph<'a>(pw: *c_void) -> &'a UntypedHandler<'a> { + fn ph<'a>(pw: *c_void) -> &'a UntypedHandler<'a> { unsafe { transmute(pw) } } pub extern fn node_name(pw: *c_void, node: *c_void, qname: *mut css_qname) -> css_error { @@ -956,7 +956,7 @@ pub mod select { ua_default_for_property: &'self fn(property: uint32_t, hint: *mut css_hint) -> css_error, } - priv fn with_untyped_handler, R>(handler: &H, f: &fn(&UntypedHandler) -> R) -> R { + fn with_untyped_handler, R>(handler: &H, f: &fn(&UntypedHandler) -> R) -> R { unsafe { let untyped_handler = UntypedHandler { node_name: |node: *c_void, qname: *mut css_qname| -> css_error {