diff --git a/Cargo.lock b/Cargo.lock index 36851cc..55138e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -126,6 +126,16 @@ dependencies = [ "vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "codegen" +version = "0.1.0" +dependencies = [ + "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "conv" version = "0.3.3" @@ -572,6 +582,7 @@ dependencies = [ "bart_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.26.2 (registry+https://github.com/rust-lang/crates.io-index)", + "codegen 0.1.0", "diesel 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "diesel_codegen 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -593,7 +604,6 @@ dependencies = [ "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "slug 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "static_resource_derive 0.1.0", "titlecase 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -695,16 +705,6 @@ name = "smallvec" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "static_resource_derive" -version = "0.1.0" -dependencies = [ - "base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "sha2 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "strsim" version = "0.6.0" diff --git a/Cargo.toml b/Cargo.toml index bdb659f..e9a51df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,8 +55,8 @@ version = "0.1" version = "0.0.11" default-features = false -[dependencies.static_resource_derive] -path = "libs/static_resource_derive" +[dependencies.codegen] +path = "libs/codegen" [build-dependencies] quote = "0.3.10" diff --git a/libs/static_resource_derive/Cargo.toml b/libs/codegen/Cargo.toml similarity index 85% rename from libs/static_resource_derive/Cargo.toml rename to libs/codegen/Cargo.toml index 63b98cd..a2e315e 100644 --- a/libs/static_resource_derive/Cargo.toml +++ b/libs/codegen/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "static_resource_derive" +name = "codegen" version = "0.1.0" authors = ["Magnus Hoff "] license = "GPL-3.0" diff --git a/libs/static_resource_derive/src/lib.rs b/libs/codegen/src/lib.rs similarity index 100% rename from libs/static_resource_derive/src/lib.rs rename to libs/codegen/src/lib.rs diff --git a/src/main.rs b/src/main.rs index 0127d55..ad30d02 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,26 +1,26 @@ #![recursion_limit="128"] // for diesel's infer_schema! #[macro_use] extern crate bart_derive; -#[macro_use] extern crate diesel; +#[macro_use] extern crate codegen; #[macro_use] extern crate diesel_codegen; +#[macro_use] extern crate diesel; #[macro_use] extern crate hyper; #[macro_use] extern crate lazy_static; #[macro_use] extern crate maplit; #[macro_use] extern crate serde_derive; -#[macro_use] extern crate static_resource_derive; extern crate chrono; extern crate clap; extern crate diff; -extern crate futures; extern crate futures_cpupool; +extern crate futures; extern crate percent_encoding; extern crate pulldown_cmark; -extern crate r2d2; extern crate r2d2_diesel; -extern crate serde; +extern crate r2d2; extern crate serde_json; extern crate serde_urlencoded; +extern crate serde; extern crate slug; extern crate titlecase;