Remove diesel_codegen_shared

.travis.yml

@@ -24,7 +24,7 @@ script:
   fi &&
   (cd diesel_cli && travis-cargo test -- --no-default-features --features "$BACKEND") &&
   (cd diesel_infer_schema && travis-cargo test -- --no-default-features --features "$BACKEND") &&
-  (cd diesel_codegen_shared && travis-cargo test -- --no-default-features --features "dotenv $BACKEND") &&
+  (cd diesel_codegen && travis-cargo test -- --no-default-features --features "dotenv $BACKEND") &&
   if [[ "$TRAVIS_RUST_VERSION" == nightly* ]]; then
     (cd diesel_tests && travis-cargo test -- --no-default-features --features "unstable $BACKEND")
   else

Cargo.toml

@@ -3,7 +3,6 @@ members = [
     "diesel",
     "diesel_cli",
     "diesel_codegen",
-    "diesel_codegen_shared",
     # FIXME: getting "multiple matching crates for `diesel`" because of the shared build directory
     # "diesel_compile_tests",
     "diesel_tests",
@@ -16,5 +15,4 @@ members = [
 [replace]
 "diesel:0.10.1" = { path = "diesel" }
 "diesel_codegen:0.10.1" = { path = "diesel_codegen" }
-"diesel_codegen_shared:0.10.0" = { path = "diesel_codegen_shared" }
 "diesel_infer_schema:0.10.1" = { path = "diesel_infer_schema" }

diesel_codegen/Cargo.toml

@@ -11,17 +11,19 @@ keywords = ["orm", "database", "postgres", "sql", "codegen"]
 
 [dependencies]
 syn = "0.10.3"
-quote = "0.3.10"
+quote = "0.3.12"
+dotenv = { version = "0.8.0", optional = true }
 diesel = { version = "0.10.0", default-features = false }
-diesel_codegen_shared = { version = "0.10.0", default-features = false, optional = true }
 diesel_infer_schema = { version = "0.10.1", default-features = false, optional = true }
 
+[dev-dependencies]
+tempdir = "0.3.4"
+
 [lib]
 proc-macro = true
 
 [features]
 default = ["dotenv"]
-dotenv = ["diesel_codegen_shared/dotenv"]
-postgres = ["diesel_codegen_shared/postgres", "diesel_infer_schema/postgres"]
-sqlite = ["diesel_codegen_shared/sqlite", "diesel_infer_schema/sqlite"]
-mysql = ["diesel_codegen_shared/mysql", "diesel_infer_schema/mysql"]
+postgres = ["diesel_infer_schema/postgres"]
+sqlite = ["diesel_infer_schema/sqlite"]
+mysql = ["diesel_infer_schema/mysql"]

diesel_codegen/src/embed_migrations.rs

@@ -2,7 +2,7 @@ use syn;
 use quote;
 
 use diesel::migrations::{migration_paths_in_directory, version_from_path};
-use diesel_codegen_shared::migration_directory_from_given_path;
+use migrations::migration_directory_from_given_path;
 use std::error::Error;
 use std::path::Path;
 

diesel_codegen/src/lib.rs

@@ -9,8 +9,8 @@ macro_rules! t {
     };
 }
 
-#[cfg(feature = "diesel_codegen_shared")]
-extern crate diesel_codegen_shared;
+#[cfg(feature = "dotenv")]
+extern crate dotenv;
 #[cfg(feature = "diesel_infer_schema")]
 extern crate diesel_infer_schema;
 extern crate diesel;
@@ -30,7 +30,10 @@ mod model;
 mod queryable;
 #[cfg(feature = "diesel_infer_schema")]
 mod schema_inference;
+#[cfg(feature = "diesel_infer_schema")]
+mod database_url;
 mod util;
+mod migrations;
 
 use proc_macro::TokenStream;
 use syn::parse_macro_input;

diesel_codegen/src/schema_inference.rs

@@ -1,7 +1,7 @@
 use syn;
 use quote;
 
-use diesel_codegen_shared::extract_database_url;
+use database_url::extract_database_url;
 use diesel_infer_schema::*;
 
 use util::{get_options_from_input, get_option, get_optional_option};

diesel_codegen_shared/Cargo.toml

@@ -1,22 +0,0 @@
-[package]
-name = "diesel_codegen_shared"
-version = "0.10.0"
-authors = ["Sean Griffin <sean@seantheprogrammer.com>"]
-license = "MIT OR Apache-2.0"
-description = "Shared code between `diesel_codegen` and `diesel_codegen_syntex`"
-documentation = "http://docs.diesel.rs"
-homepage = "http://diesel.rs"
-repository = "https://github.com/diesel-rs/diesel"
-
-[dependencies]
-diesel = { version = "0.10.0", default-features = false }
-dotenv = { version = "0.8.0", optional = true }
-
-[dev-dependencies]
-tempdir = "0.3.4"
-
-[features]
-default = ["dotenv"]
-postgres = ["diesel/postgres"]
-sqlite = ["diesel/sqlite"]
-mysql = ["diesel/mysql"]

diesel_codegen_shared/src/lib.rs

@@ -1,11 +0,0 @@
-#![deny(warnings)]
-
-extern crate diesel;
-#[cfg(feature = "dotenv")]
-extern crate dotenv;
-
-mod database_url;
-mod migrations;
-
-pub use self::database_url::extract_database_url;
-pub use self::migrations::*;