From b767c1bdec0c1c8c9c0f658cfff5859239ef3a4e Mon Sep 17 00:00:00 2001 From: Sergio Benitez Date: Fri, 5 Aug 2016 21:57:55 -0700 Subject: [PATCH] Fixed Cargo.toml in todo for new diesel. Serde is still broken. --- examples/todo/Cargo.toml | 10 +++++----- examples/todo/src/main.rs | 3 +-- examples/todo/src/task.rs | 1 - 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/examples/todo/Cargo.toml b/examples/todo/Cargo.toml index d39dca41..b6ccb129 100644 --- a/examples/todo/Cargo.toml +++ b/examples/todo/Cargo.toml @@ -8,8 +8,8 @@ rocket = { path = "../../lib" } rocket_macros = { path = "../../macros" } lazy_static = "*" tera = "*" -serde = { git = "https://github.com/serde-rs/serde" } -serde_json = { git = "https://github.com/serde-rs/json" } -serde_macros = { git = "https://github.com/serde-rs/serde" } -diesel = { version = "*", features = ["sqlite"] } -diesel_codegen = { git = "https://github.com/diesel-rs/diesel/", default_features = false, features = ["nightly", "sqlite"] } +serde = "0.8" +serde_json = "0.8" +serde_macros = "0.8" +diesel = { git = "https://github.com/diesel-rs/diesel.git", features = ["sqlite"] } +diesel_codegen = { git = "https://github.com/diesel-rs/diesel.git", default_features = false, features = ["sqlite"] } diff --git a/examples/todo/src/main.rs b/examples/todo/src/main.rs index 46bd7690..bcaa125a 100644 --- a/examples/todo/src/main.rs +++ b/examples/todo/src/main.rs @@ -1,12 +1,11 @@ #![feature(plugin, custom_derive, custom_attribute)] -#![plugin(rocket_macros, diesel_codegen, serde_macros)] +#![plugin(rocket_macros, serde_macros, diesel_codegen)] extern crate rocket; extern crate tera; #[macro_use] extern crate diesel; #[macro_use] extern crate lazy_static; extern crate serde_json; -extern crate serde; mod static_files; mod task; diff --git a/examples/todo/src/task.rs b/examples/todo/src/task.rs index 447a8401..17a74128 100644 --- a/examples/todo/src/task.rs +++ b/examples/todo/src/task.rs @@ -1,5 +1,4 @@ use diesel; -use serde::Serialize; use diesel::prelude::*; use diesel::sqlite::SqliteConnection; use self::schema::tasks;