Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Using no_std + alloc #279

Merged
merged 5 commits into from
Jul 30, 2021
Merged

Using no_std + alloc #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c0129a
Using no_std + alloc.
halzy Jul 25, 2021
54d7965
Move std import to the modules that need them
lambda-fairy Jul 30, 2021
dd8ef2d
Add #![no_std] to maud_htmlescape
lambda-fairy Jul 30, 2021
32ddc40
Use absolute import for alloc crate
lambda-fairy Jul 30, 2021
c363437
Whoops, shouldn't have used absolute imports
lambda-fairy Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## [Unreleased]

- Support `no_std` + `alloc`.
[#278](https://github.com/lambda-fairy/maud/issues/278)

## [0.22.2] - 2021-01-09

- Don't require `?` suffix for empty attributes. The old syntax is kept for backward compatibility.
Expand Down
18 changes: 16 additions & 2 deletions maud/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![no_std]

//! A macro for writing HTML templates.
//!
//! This documentation only describes the runtime API. For a general
Expand All @@ -7,7 +9,10 @@

#![doc(html_root_url = "https://docs.rs/maud/0.22.2")]

use std::fmt::{self, Write};
extern crate alloc;

use alloc::string::String;
use core::fmt::{self, Write};

pub use maud_macros::{html, html_debug};

Expand Down Expand Up @@ -89,8 +94,9 @@ impl<T: fmt::Display + ?Sized> Render for T {
#[doc(hidden)]
pub mod render {
use crate::Render;
use alloc::string::String;
use core::fmt::Write;
use maud_htmlescape::Escaper;
use std::fmt::Write;

pub trait RenderInternal {
fn __maud_render_to(&self, w: &mut String);
Expand Down Expand Up @@ -167,7 +173,11 @@ pub const DOCTYPE: PreEscaped<&'static str> = PreEscaped("<!DOCTYPE html>");

#[cfg(feature = "iron")]
mod iron_support {
extern crate std;

use crate::PreEscaped;
use alloc::boxed::Box;
use alloc::string::String;
use iron::headers::ContentType;
use iron::modifier::{Modifier, Set};
use iron::modifiers::Header;
Expand All @@ -191,7 +201,10 @@ mod iron_support {

#[cfg(feature = "rocket")]
mod rocket_support {
extern crate std;

use crate::PreEscaped;
use alloc::string::String;
use rocket::http::{ContentType, Status};
use rocket::request::Request;
use rocket::response::{Responder, Response};
Expand All @@ -211,6 +224,7 @@ mod rocket_support {
mod actix_support {
use crate::PreEscaped;
use actix_web_dep::{Error, HttpRequest, HttpResponse, Responder};
use alloc::string::String;
use futures_util::future::{ok, Ready};

impl Responder for PreEscaped<String> {
Expand Down
7 changes: 6 additions & 1 deletion maud_htmlescape/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![cfg_attr(not(test), no_std)]

//! Internal support code used by the [Maud] template engine.
//!
//! You should not need to depend on this crate directly.
Expand All @@ -6,7 +8,10 @@

#![doc(html_root_url = "https://docs.rs/maud_htmlescape/0.17.0")]

use std::fmt;
extern crate alloc;

use alloc::string::String;
use core::fmt;

/// An adapter that escapes HTML special characters.
///
Expand Down
3 changes: 2 additions & 1 deletion maud_macros/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ fn expand(input: TokenStream) -> TokenStream {
let markups = parse::parse(input);
let stmts = generate::generate(markups, output_ident.clone());
quote!({
extern crate alloc;
extern crate maud;
let mut #output_ident = ::std::string::String::with_capacity(#size_hint);
let mut #output_ident = alloc::string::String::with_capacity(#size_hint);
#stmts
maud::PreEscaped(#output_ident)
})
Expand Down