use serde from rocket_dyn_templates
This commit is contained in:
12
src/main.rs
12
src/main.rs
@@ -1,6 +1,3 @@
|
||||
extern crate serde;
|
||||
extern crate serde_json;
|
||||
|
||||
#[macro_use]
|
||||
extern crate rocket;
|
||||
|
||||
@@ -8,6 +5,7 @@ use rocket::response::Redirect;
|
||||
use rocket::State;
|
||||
use rocket::fs::FileServer;
|
||||
use rocket_dyn_templates::Template;
|
||||
use rocket_dyn_templates::tera;
|
||||
|
||||
use rand::distributions::Uniform;
|
||||
use rand::Rng;
|
||||
@@ -37,11 +35,11 @@ impl<T, E> ErrorEmpty for Result<T, E> {
|
||||
|
||||
#[derive(Clone)]
|
||||
struct ArcTemplateData {
|
||||
value: Arc<serde_json::Value>,
|
||||
value: Arc<tera::Value>,
|
||||
}
|
||||
|
||||
impl ArcTemplateData {
|
||||
fn new(value: serde_json::Value) -> ArcTemplateData {
|
||||
fn new(value: tera::Value) -> ArcTemplateData {
|
||||
ArcTemplateData {
|
||||
value: Arc::new(value),
|
||||
}
|
||||
@@ -94,10 +92,10 @@ fn show_question_details(
|
||||
|
||||
match get_question(&data.db, id) {
|
||||
Ok(question) => {
|
||||
let mut context = serde_json::to_value(question).expect("question serialize");
|
||||
let mut context = tera::to_value(question).expect("question serialize");
|
||||
if context.is_object() {
|
||||
let next_id = random_question_id(&data.database_distribution);
|
||||
context["next"] = serde_json::to_value(next_id).expect("question id serialize");
|
||||
context["next"] = tera::to_value(next_id).expect("question id serialize");
|
||||
}
|
||||
|
||||
let value = ArcTemplateData::new(context);
|
||||
|
Reference in New Issue
Block a user