michael/sailfish
michael
/
sailfish
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: Rename private trait method

This commit is contained in:
Kogia-sima 2020-06-16 22:27:08 +09:00
parent 9e2952d92d
commit 0cfcb14624
2 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sailfish/src/runtime/macros.rs
View File

@ -2,7 +2,7 @@
#[doc(hidden)]
macro_rules! render {
($ctx:ident, $value:expr) => {
(&($value))._sailfish_render_internal(&mut $ctx.buf)?
(&($value))._sf_r_internal(&mut $ctx.buf)?
};
}
@ -10,7 +10,7 @@ macro_rules! render {
#[doc(hidden)]
macro_rules! render_escaped {
($ctx:ident, $value:expr) => {
(&($value))._sailfish_render_escaped_internal(&mut $ctx.buf)?
(&($value))._sf_re_internal(&mut $ctx.buf)?
};
}

64
sailfish/src/runtime/render.rs
View File

@ -183,24 +183,18 @@ render_float!(f32, f64);
// private trait for avoiding method name collision in render* macros
#[doc(hidden)]
pub trait RenderInternal {
fn _sailfish_render_internal(&self, b: &mut Buffer) -> Result<(), RenderError>;
fn _sailfish_render_escaped_internal(
&self,
b: &mut Buffer,
) -> Result<(), RenderError>;
fn _sf_r_internal(&self, b: &mut Buffer) -> Result<(), RenderError>;
fn _sf_re_internal(&self, b: &mut Buffer) -> Result<(), RenderError>;
}
impl<T: Render + ?Sized> RenderInternal for T {
#[inline]
fn _sailfish_render_internal(&self, b: &mut Buffer) -> Result<(), RenderError> {
fn _sf_r_internal(&self, b: &mut Buffer) -> Result<(), RenderError> {
self.render(b)
}
#[inline]
fn _sailfish_render_escaped_internal(
&self,
b: &mut Buffer,
) -> Result<(), RenderError> {
fn _sf_re_internal(&self, b: &mut Buffer) -> Result<(), RenderError> {
self.render_escaped(b)
}
}
@ -212,34 +206,34 @@ mod tests {
#[test]
fn receiver_coercion() {
let mut b = Buffer::new();
(&1)._sailfish_render_internal(&mut b).unwrap();
(&&1)._sailfish_render_internal(&mut b).unwrap();
(&&&1)._sailfish_render_internal(&mut b).unwrap();
(&&&&1)._sailfish_render_internal(&mut b).unwrap();
(&1)._sf_r_internal(&mut b).unwrap();
(&&1)._sf_r_internal(&mut b).unwrap();
(&&&1)._sf_r_internal(&mut b).unwrap();
(&&&&1)._sf_r_internal(&mut b).unwrap();
assert_eq!(b.as_str(), "1111");
b.clear();
let v = 2.0;
(&v)._sailfish_render_internal(&mut b).unwrap();
(&&v)._sailfish_render_internal(&mut b).unwrap();
(&&&v)._sailfish_render_internal(&mut b).unwrap();
(&&&&v)._sailfish_render_internal(&mut b).unwrap();
(&v)._sf_r_internal(&mut b).unwrap();
(&&v)._sf_r_internal(&mut b).unwrap();
(&&&v)._sf_r_internal(&mut b).unwrap();
(&&&&v)._sf_r_internal(&mut b).unwrap();
assert_eq!(b.as_str(), "2.02.02.02.0");
b.clear();
let s = "apple";
(&*s)._sailfish_render_escaped_internal(&mut b).unwrap();
(&s)._sailfish_render_escaped_internal(&mut b).unwrap();
(&&s)._sailfish_render_escaped_internal(&mut b).unwrap();
(&&&s)._sailfish_render_escaped_internal(&mut b).unwrap();
(&&&&s)._sailfish_render_escaped_internal(&mut b).unwrap();
(&*s)._sf_re_internal(&mut b).unwrap();
(&s)._sf_re_internal(&mut b).unwrap();
(&&s)._sf_re_internal(&mut b).unwrap();
(&&&s)._sf_re_internal(&mut b).unwrap();
(&&&&s)._sf_re_internal(&mut b).unwrap();
assert_eq!(b.as_str(), "appleappleappleappleapple");
b.clear();
(&'c')._sailfish_render_escaped_internal(&mut b).unwrap();
(&&'<')._sailfish_render_escaped_internal(&mut b).unwrap();
(&&&'&')._sailfish_render_escaped_internal(&mut b).unwrap();
(&&&&' ')._sailfish_render_escaped_internal(&mut b).unwrap();
(&'c')._sf_re_internal(&mut b).unwrap();
(&&'<')._sf_re_internal(&mut b).unwrap();
(&&&'&')._sf_re_internal(&mut b).unwrap();
(&&&&' ')._sf_re_internal(&mut b).unwrap();
assert_eq!(b.as_str(), "c&lt;&amp; ");
b.clear();
}
@ -250,18 +244,10 @@ mod tests {
use std::rc::Rc;
let mut b = Buffer::new();
(&String::from("a"))
._sailfish_render_internal(&mut b)
.unwrap();
(&&PathBuf::from("b"))
._sailfish_render_internal(&mut b)
.unwrap();
(&Rc::new(4u32))
._sailfish_render_escaped_internal(&mut b)
.unwrap();
(&Rc::new(2.3f32))
._sailfish_render_escaped_internal(&mut b)
.unwrap();
(&String::from("a"))._sf_r_internal(&mut b).unwrap();
(&&PathBuf::from("b"))._sf_r_internal(&mut b).unwrap();
(&Rc::new(4u32))._sf_re_internal(&mut b).unwrap();
(&Rc::new(2.3f32))._sf_re_internal(&mut b).unwrap();
assert_eq!(b.as_str(), "ab42.3");
}