Give Markup type one lifetime instead of two

This commit is contained in:
Chris Wong 2015-01-15 10:16:43 +13:00
parent e4e80b7ee5
commit e4a804a365

View file

@ -13,11 +13,11 @@ pub fn escape(s: &str) -> String {
} }
/// A block of HTML markup, as returned by the `html!` macro. /// A block of HTML markup, as returned by the `html!` macro.
pub struct Markup<'a, 'b: 'a> { pub struct Markup<'a> {
callback: &'a (Fn(&mut fmt::Writer) -> fmt::Result + 'b), callback: &'a (Fn(&mut fmt::Writer) -> fmt::Result + 'a),
} }
impl<'a, 'b> Markup<'a, 'b> { impl<'a> Markup<'a> {
/// Render the markup to a `String`. /// Render the markup to a `String`.
pub fn render(&self) -> String { pub fn render(&self) -> String {
let mut buf = String::new(); let mut buf = String::new();
@ -58,7 +58,7 @@ pub mod rt {
use super::Markup; use super::Markup;
#[inline] #[inline]
pub fn make_markup<'a, 'b>(f: &'a (Fn(&mut fmt::Writer) -> fmt::Result + 'b)) -> Markup<'a, 'b> { pub fn make_markup<'a>(f: &'a (Fn(&mut fmt::Writer) -> fmt::Result + 'a)) -> Markup<'a> {
Markup { callback: f } Markup { callback: f }
} }