Update to Rocket 0.3 ()

Also fixes diff links in CHANGELOG.md.
This commit is contained in:
Brayden 2017-07-14 17:43:29 -07:00 committed by Chris Wong
parent a72877cb55
commit 70f55b9771
3 changed files with 9 additions and 3 deletions

View file

@ -1,5 +1,9 @@
# Change Log # Change Log
## [Unreleased] - 2017-07-14
- [Changed] Update to Rocket 0.3
## [0.16.3] - 2017-04-22 ## [0.16.3] - 2017-04-22
- [Fixed] Update to rustc 1.18.0-nightly (1785bca51 2017-04-21) - [Fixed] Update to rustc 1.18.0-nightly (1785bca51 2017-04-21)
@ -127,7 +131,8 @@
- [Fixed] Update to latest syntax extension API - [Fixed] Update to latest syntax extension API
[Unreleased]: https://github.com/lfairy/maud/compare/v0.16.2...HEAD [Unreleased]: https://github.com/lfairy/maud/compare/v0.16.3...HEAD
[0.16.3]: https://github.com/lfairy/maud/compare/v0.16.2...v0.16.3
[0.16.2]: https://github.com/lfairy/maud/compare/v0.16.1...v0.16.2 [0.16.2]: https://github.com/lfairy/maud/compare/v0.16.1...v0.16.2
[0.16.1]: https://github.com/lfairy/maud/compare/v0.16.0...v0.16.1 [0.16.1]: https://github.com/lfairy/maud/compare/v0.16.0...v0.16.1
[0.16.0]: https://github.com/lfairy/maud/compare/v0.15.0...v0.16.0 [0.16.0]: https://github.com/lfairy/maud/compare/v0.15.0...v0.16.0

View file

@ -14,7 +14,7 @@ categories = ["template-engine"]
[dependencies] [dependencies]
iron = { version = "0.5.1", optional = true } iron = { version = "0.5.1", optional = true }
rocket = { version = ">= 0.1.2, < 0.3", optional = true } rocket = { version = "0.3", optional = true }
[badges] [badges]
travis-ci = { repository = "lfairy/maud" } travis-ci = { repository = "lfairy/maud" }

View file

@ -214,12 +214,13 @@ mod iron_support {
#[cfg(feature = "rocket")] #[cfg(feature = "rocket")]
mod rocket_support { mod rocket_support {
use rocket::http::{ContentType, Status}; use rocket::http::{ContentType, Status};
use rocket::request::Request;
use rocket::response::{Responder, Response}; use rocket::response::{Responder, Response};
use std::io::Cursor; use std::io::Cursor;
use PreEscaped; use PreEscaped;
impl Responder<'static> for PreEscaped<String> { impl Responder<'static> for PreEscaped<String> {
fn respond(self) -> Result<Response<'static>, Status> { fn respond_to(self, _: &Request) -> Result<Response<'static>, Status> {
Response::build() Response::build()
.header(ContentType::HTML) .header(ContentType::HTML)
.sized_body(Cursor::new(self.0)) .sized_body(Cursor::new(self.0))