mirror of https://github.com/rwf2/Rocket.git
Use 'serde' 'derive' feature, not 'serde_derive'.
This commit is contained in:
parent
ddfd73d6f3
commit
31ddb0de45
|
@ -8,6 +8,5 @@ publish = false
|
|||
[dependencies]
|
||||
tokio = { version = "0.2.0", features = ["io-util"] }
|
||||
rocket = { path = "../../core/lib" }
|
||||
serde = "1.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
serde_derive = "1.0"
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
#[macro_use] extern crate rocket;
|
||||
#[macro_use] extern crate serde_derive;
|
||||
|
||||
#[cfg(test)] mod tests;
|
||||
|
||||
use std::io;
|
||||
|
||||
use tokio::io::AsyncReadExt;
|
||||
|
||||
use rocket::tokio::io::AsyncReadExt;
|
||||
use rocket::{Request, data::Data};
|
||||
use rocket::response::{Debug, content::{Json, Html}};
|
||||
|
||||
use serde::{Serialize, Deserialize};
|
||||
|
||||
// NOTE: This example explicitly uses the `Json` type from `response::content`
|
||||
// for demonstration purposes. In a real application, _always_ prefer to use
|
||||
// `rocket_contrib::json::Json` instead!
|
||||
|
|
|
@ -7,8 +7,7 @@ publish = false
|
|||
|
||||
[dependencies]
|
||||
rocket = { path = "../../core/lib" }
|
||||
serde = "1.0"
|
||||
serde_derive = "1.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
|
||||
[dependencies.rocket_contrib]
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#[macro_use] extern crate rocket;
|
||||
#[macro_use] extern crate serde_derive;
|
||||
|
||||
#[cfg(test)] mod tests;
|
||||
|
||||
|
@ -7,7 +6,7 @@ use rocket::Request;
|
|||
use rocket::response::Redirect;
|
||||
use rocket_contrib::templates::{Template, handlebars};
|
||||
|
||||
#[derive(Serialize)]
|
||||
#[derive(serde::Serialize)]
|
||||
struct TemplateContext {
|
||||
title: &'static str,
|
||||
name: Option<String>,
|
||||
|
|
|
@ -7,9 +7,8 @@ publish = false
|
|||
|
||||
[dependencies]
|
||||
rocket = { path = "../../core/lib" }
|
||||
serde = "1.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
serde_derive = "1.0"
|
||||
|
||||
[dependencies.rocket_contrib]
|
||||
path = "../../contrib/lib"
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
#[macro_use] extern crate rocket;
|
||||
#[macro_use] extern crate rocket_contrib;
|
||||
#[macro_use] extern crate serde_derive;
|
||||
|
||||
#[cfg(test)] mod tests;
|
||||
|
||||
|
@ -10,6 +9,8 @@ use std::collections::HashMap;
|
|||
use rocket::State;
|
||||
use rocket_contrib::json::{Json, JsonValue};
|
||||
|
||||
use serde::{Serialize, Deserialize};
|
||||
|
||||
// The type to represent the ID of a message.
|
||||
type ID = usize;
|
||||
|
||||
|
|
|
@ -7,8 +7,7 @@ publish = false
|
|||
|
||||
[dependencies]
|
||||
rocket = { path = "../../core/lib" }
|
||||
serde = "1.0"
|
||||
serde_derive = "1.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
|
||||
[dependencies.rocket_contrib]
|
||||
path = "../../contrib/lib"
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
#[macro_use] extern crate rocket;
|
||||
#[macro_use] extern crate serde_derive;
|
||||
|
||||
#[cfg(test)] mod tests;
|
||||
|
||||
use rocket_contrib::msgpack::MsgPack;
|
||||
|
||||
use serde::{Serialize, Deserialize};
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct Message<'r> {
|
||||
id: usize,
|
||||
|
|
|
@ -2,6 +2,8 @@ use crate::rocket;
|
|||
use rocket::local::blocking::Client;
|
||||
use rocket::http::{Status, ContentType};
|
||||
|
||||
use serde::{Serialize, Deserialize};
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct Message {
|
||||
id: usize,
|
||||
|
|
|
@ -7,8 +7,7 @@ publish = false
|
|||
|
||||
[dependencies]
|
||||
rocket = { path = "../../core/lib" }
|
||||
serde = "1.0"
|
||||
serde_derive = "1.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
|
||||
[dependencies.rocket_contrib]
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#[macro_use] extern crate rocket;
|
||||
#[macro_use] extern crate serde_derive;
|
||||
|
||||
#[cfg(test)] mod tests;
|
||||
|
||||
|
@ -9,7 +8,7 @@ use rocket::Request;
|
|||
use rocket::response::Redirect;
|
||||
use rocket_contrib::templates::Template;
|
||||
|
||||
#[derive(Serialize)]
|
||||
#[derive(serde::Serialize)]
|
||||
struct TemplateContext {
|
||||
name: String,
|
||||
items: Vec<&'static str>
|
||||
|
|
|
@ -7,9 +7,8 @@ publish = false
|
|||
|
||||
[dependencies]
|
||||
rocket = { path = "../../core/lib" }
|
||||
serde = "1.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
serde_derive = "1.0"
|
||||
diesel = { version = "1.3", features = ["sqlite", "r2d2"] }
|
||||
diesel_migrations = "1.3"
|
||||
log = "0.4"
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
#[macro_use] extern crate diesel;
|
||||
#[macro_use] extern crate diesel_migrations;
|
||||
#[macro_use] extern crate log;
|
||||
#[macro_use] extern crate serde_derive;
|
||||
#[macro_use] extern crate rocket_contrib;
|
||||
|
||||
mod task;
|
||||
|
@ -25,7 +24,7 @@ embed_migrations!();
|
|||
#[database("sqlite_database")]
|
||||
pub struct DbConn(SqliteConnection);
|
||||
|
||||
#[derive(Debug, Serialize)]
|
||||
#[derive(Debug, serde::Serialize)]
|
||||
struct Context<'a> {
|
||||
msg: Option<(&'a str, &'a str)>,
|
||||
tasks: Vec<Task>
|
||||
|
|
|
@ -14,7 +14,7 @@ use self::schema::tasks;
|
|||
use self::schema::tasks::dsl::{tasks as all_tasks, completed as task_completed};
|
||||
|
||||
#[table_name="tasks"]
|
||||
#[derive(Serialize, Queryable, Insertable, Debug, Clone)]
|
||||
#[derive(serde::Serialize, Queryable, Insertable, Debug, Clone)]
|
||||
pub struct Task {
|
||||
pub id: Option<i32>,
|
||||
pub description: String,
|
||||
|
|
Loading…
Reference in New Issue