From 6a593388ae63faa37b72920b9a4c85612fc64794 Mon Sep 17 00:00:00 2001 From: Chris Wong <lambda.fairy@gmail.com> Date: Sat, 8 Jul 2017 20:27:14 +1200 Subject: [PATCH] Fix maud_extras --- maud_extras/Cargo.toml | 1 - maud_extras/lib.rs | 29 ++++++++++++++--------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/maud_extras/Cargo.toml b/maud_extras/Cargo.toml index 01f883b..a733309 100644 --- a/maud_extras/Cargo.toml +++ b/maud_extras/Cargo.toml @@ -10,7 +10,6 @@ description = "Extra bits and pieces for use in Maud templates." [dependencies] maud = { path = "../maud", features = ["iron"] } -maud_macros = { path = "../maud_macros" } [lib] path = "lib.rs" diff --git a/maud_extras/lib.rs b/maud_extras/lib.rs index 1f2aec7..2756d68 100644 --- a/maud_extras/lib.rs +++ b/maud_extras/lib.rs @@ -1,19 +1,18 @@ -#![feature(plugin)] -#![plugin(maud_macros)] +#![feature(proc_macro)] extern crate maud; -use maud::{Markup, Render}; +use maud::{Markup, Render, html}; /// Links to an external stylesheet. /// /// # Example /// /// ```rust -/// # #![feature(plugin)] -/// # #![plugin(maud_macros)] +/// # #![feature(proc_macro)] /// # extern crate maud; /// # extern crate maud_extras; +/// # use maud::html; /// # use maud_extras::*; /// # fn main() { /// let markup = html! { (Css("styles.css")) }; @@ -36,10 +35,10 @@ impl<T: AsRef<str>> Render for Css<T> { /// # Example /// /// ```rust -/// # #![feature(plugin)] -/// # #![plugin(maud_macros)] +/// # #![feature(proc_macro)] /// # extern crate maud; /// # extern crate maud_extras; +/// # use maud::html; /// # use maud_extras::*; /// # fn main() { /// let markup = html! { (Js("app.js")) }; @@ -62,10 +61,10 @@ impl<T: AsRef<str>> Render for Js<T> { /// # Example /// /// ```rust -/// # #![feature(plugin)] -/// # #![plugin(maud_macros)] +/// # #![feature(proc_macro)] /// # extern crate maud; /// # extern crate maud_extras; +/// # use maud::html; /// # use maud_extras::*; /// # fn main() { /// let markup = html! { (Meta("description", "test description")) }; @@ -88,10 +87,10 @@ impl<T: AsRef<str>, U: AsRef<str>> Render for Meta<T, U> { /// # Example /// /// ```rust -/// # #![feature(plugin)] -/// # #![plugin(maud_macros)] +/// # #![feature(proc_macro)] /// # extern crate maud; /// # extern crate maud_extras; +/// # use maud::html; /// # use maud_extras::*; /// # fn main() { /// let markup = html! { (Title("Maud")) }; @@ -114,10 +113,10 @@ impl<T: AsRef<str>> Render for Title<T> { /// # Example /// /// ```rust -/// # #![feature(plugin)] -/// # #![plugin(maud_macros)] +/// # #![feature(proc_macro)] /// # extern crate maud; /// # extern crate maud_extras; +/// # use maud::html; /// # use maud_extras::*; /// # fn main() { /// let markup = html! { (Charset("utf-8")) }; @@ -140,10 +139,10 @@ impl<T: AsRef<str>> Render for Charset<T> { /// # Example /// /// ```rust -/// # #![feature(plugin)] -/// # #![plugin(maud_macros)] +/// # #![feature(proc_macro)] /// # extern crate maud; /// # extern crate maud_extras; +/// # use maud::html; /// # use maud_extras::*; /// # fn main() { /// let markup = html! { (MetaProperty("og:description", "test description")) };