From 14cf4b8fdd69b31c8030b6530bbe07fd1df5b25a Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Mon, 4 Mar 2019 17:22:15 +0100
Subject: Use rocket_contrib's JsonValue as return type.

---
 src/lib.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/lib.rs b/src/lib.rs
index 09e092c..e6bb0f6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -19,12 +19,13 @@
 
 use rocket::{
     get,
-    response::content::Json,
     routes,
 };
 use rocket_contrib::{
     database,
     databases::diesel,
+    json,
+    json::JsonValue,
 };
 use std::collections::HashMap;
 use std::error::Error;
@@ -34,8 +35,8 @@ use std::result::Result;
 struct DbConn(diesel::PgConnection);
 
 #[get("/")]
-fn get_rooms(_db: DbConn) -> Json<String> {
-    Json("[]".into())
+fn get_rooms(_db: DbConn) -> JsonValue {
+    json!([])
 }
 
 pub fn build_rocket() -> Result<rocket::Rocket, Box<dyn Error>> {
-- 
cgit v1.2.3