From 57715004429182943c45788c86e565eabec7fcc1 Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Sun, 4 Feb 2018 07:06:49 -0700 Subject: [PATCH] Rename `diesel_codegen2` to `diesel_codegen` Now that the old crate has been removed, we can move the rewrite over. --- .travis.yml | 6 +++--- Cargo.toml | 2 +- bin/check | 4 ++-- bin/test | 6 +++--- diesel/Cargo.toml | 10 +++++----- diesel/src/lib.rs | 4 ++-- {diesel_derives2 => diesel_derives}/Cargo.toml | 2 +- .../src/as_changeset.rs | 0 .../src/as_expression.rs | 0 .../src/associations.rs | 0 .../src/diagnostic_shim.rs | 0 {diesel_derives2 => diesel_derives}/src/field.rs | 0 .../src/from_sql_row.rs | 0 .../src/identifiable.rs | 0 {diesel_derives2 => diesel_derives}/src/insertable.rs | 0 {diesel_derives2 => diesel_derives}/src/lib.rs | 0 {diesel_derives2 => diesel_derives}/src/meta.rs | 0 {diesel_derives2 => diesel_derives}/src/model.rs | 0 {diesel_derives2 => diesel_derives}/src/query_id.rs | 0 {diesel_derives2 => diesel_derives}/src/queryable.rs | 0 .../src/queryable_by_name.rs | 0 {diesel_derives2 => diesel_derives}/src/sql_type.rs | 0 {diesel_derives2 => diesel_derives}/src/util.rs | 0 .../tests/as_changeset.rs | 0 .../tests/associations.rs | 0 {diesel_derives2 => diesel_derives}/tests/helpers.rs | 0 .../tests/identifiable.rs | 0 .../tests/insertable.rs | 0 {diesel_derives2 => diesel_derives}/tests/queryable.rs | 0 .../tests/queryable_by_name.rs | 0 {diesel_derives2 => diesel_derives}/tests/schema.rs | 0 {diesel_derives2 => diesel_derives}/tests/tests.rs | 0 32 files changed, 17 insertions(+), 17 deletions(-) rename {diesel_derives2 => diesel_derives}/Cargo.toml (96%) rename {diesel_derives2 => diesel_derives}/src/as_changeset.rs (100%) rename {diesel_derives2 => diesel_derives}/src/as_expression.rs (100%) rename {diesel_derives2 => diesel_derives}/src/associations.rs (100%) rename {diesel_derives2 => diesel_derives}/src/diagnostic_shim.rs (100%) rename {diesel_derives2 => diesel_derives}/src/field.rs (100%) rename {diesel_derives2 => diesel_derives}/src/from_sql_row.rs (100%) rename {diesel_derives2 => diesel_derives}/src/identifiable.rs (100%) rename {diesel_derives2 => diesel_derives}/src/insertable.rs (100%) rename {diesel_derives2 => diesel_derives}/src/lib.rs (100%) rename {diesel_derives2 => diesel_derives}/src/meta.rs (100%) rename {diesel_derives2 => diesel_derives}/src/model.rs (100%) rename {diesel_derives2 => diesel_derives}/src/query_id.rs (100%) rename {diesel_derives2 => diesel_derives}/src/queryable.rs (100%) rename {diesel_derives2 => diesel_derives}/src/queryable_by_name.rs (100%) rename {diesel_derives2 => diesel_derives}/src/sql_type.rs (100%) rename {diesel_derives2 => diesel_derives}/src/util.rs (100%) rename {diesel_derives2 => diesel_derives}/tests/as_changeset.rs (100%) rename {diesel_derives2 => diesel_derives}/tests/associations.rs (100%) rename {diesel_derives2 => diesel_derives}/tests/helpers.rs (100%) rename {diesel_derives2 => diesel_derives}/tests/identifiable.rs (100%) rename {diesel_derives2 => diesel_derives}/tests/insertable.rs (100%) rename {diesel_derives2 => diesel_derives}/tests/queryable.rs (100%) rename {diesel_derives2 => diesel_derives}/tests/queryable_by_name.rs (100%) rename {diesel_derives2 => diesel_derives}/tests/schema.rs (100%) rename {diesel_derives2 => diesel_derives}/tests/tests.rs (100%) diff --git a/.travis.yml b/.travis.yml index 6ac8a16cefc9..be89f0ecb65e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,9 @@ script: (cd diesel && travis-cargo test -- --no-default-features --features "extras $BACKEND") fi && (cd diesel && travis-cargo test -- --no-default-features --features "extras with-deprecated $BACKEND") && - (cd diesel_derives2 && travis-cargo test -- --features "diesel/$BACKEND") && + (cd diesel_derives && travis-cargo test -- --features "diesel/$BACKEND") && if [[ "$TRAVIS_RUST_VERSION" == nightly* ]]; then - (cd diesel_derives2 && travis-cargo test -- --features "diesel/unstable diesel/$BACKEND") + (cd diesel_derives && travis-cargo test -- --features "diesel/unstable diesel/$BACKEND") fi && (cd "examples/$BACKEND" && ./test_all) && (cd diesel_cli && travis-cargo test -- --no-default-features --features "$BACKEND") && @@ -47,7 +47,7 @@ matrix: script: - (cd diesel && cargo rustc --no-default-features --features "lint unstable sqlite postgres mysql extras" -- -Zno-trans) - (cd diesel_cli && cargo rustc --no-default-features --features "lint sqlite postgres mysql" -- -Zno-trans) - - (cd diesel_derives2 && cargo rustc --no-default-features --features "lint" -- -Zno-trans) + - (cd diesel_derives && cargo rustc --no-default-features --features "lint" -- -Zno-trans) - (cd diesel_migrations && cargo rustc --no-default-features --features "lint dotenv sqlite postgres mysql" -- -Zno-trans) - (cd diesel_infer_schema && cargo rustc --no-default-features --features "lint dotenv sqlite postgres mysql" -- -Zno-trans) - (cd diesel_compile_tests && travis-cargo test) diff --git a/Cargo.toml b/Cargo.toml index 4b825ccc6aca..f9af8bdf188c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ members = [ "diesel", "diesel_cli", - "diesel_derives2", + "diesel_derives", # FIXME: getting "multiple matching crates for `diesel`" because of the shared build directory # "diesel_compile_tests", "diesel_tests", diff --git a/bin/check b/bin/check index 0b43bfa7f1bf..def451d9dc46 100755 --- a/bin/check +++ b/bin/check @@ -7,9 +7,9 @@ check() { cargo rustc --quiet --features "lint $BACKENDS $1" -- -Zno-trans } -(cd diesel_derives2 && +(cd diesel_derives && check && - echo "✔ derives2 crate looks good!") + echo "✔ derives crate looks good!") (cd diesel && check "unstable extras" && diff --git a/bin/test b/bin/test index 96eaec24eafd..b9da2859245a 100755 --- a/bin/test +++ b/bin/test @@ -26,14 +26,14 @@ else (cd diesel_infer_schema/infer_schema_macros && cargo test --features "$CLIPPY sqlite" $*) (cd diesel_infer_schema && cargo test --features "$CLIPPY sqlite" $*) (cd diesel_migrations && cargo test --features "$CLIPPY sqlite" $*) - (cd diesel_derives2 && cargo test --features "$CLIPPY diesel/sqlite" $*) + (cd diesel_derives && cargo test --features "$CLIPPY diesel/sqlite" $*) (cd diesel_tests && cargo test --features "$CLIPPY sqlite" --no-default-features $*) (cd diesel_infer_schema/infer_schema_internals && cargo test --features "$CLIPPY postgres" $*) (cd diesel_infer_schema/infer_schema_macros && cargo test --features "$CLIPPY postgres" $*) (cd diesel_infer_schema && cargo test --features "$CLIPPY postgres" $*) (cd diesel_migrations && cargo test --features "$CLIPPY postgres" $*) - (cd diesel_derives2 && cargo test --features "$CLIPPY diesel/postgres" $*) + (cd diesel_derives && cargo test --features "$CLIPPY diesel/postgres" $*) (cd diesel_cli && cargo test --features "$CLIPPY postgres" --no-default-features $*) (cd diesel_tests && cargo test --features "$CLIPPY postgres" --no-default-features $*) @@ -42,7 +42,7 @@ else (cd diesel_infer_schema/infer_schema_macros && cargo test --features "$CLIPPY mysql" $*) (cd diesel_infer_schema && cargo test --features "$CLIPPY mysql" $*) (cd diesel_migrations && cargo test --features "$CLIPPY mysql" $*) - (cd diesel_derives2 && cargo test --features "$CLIPPY diesel/mysql" $*) + (cd diesel_derives && cargo test --features "$CLIPPY diesel/mysql" $*) (cd diesel_cli && cargo test --features "$CLIPPY mysql" --no-default-features $*) (cd diesel_tests && cargo test --features "$CLIPPY mysql" --no-default-features $*) unset RUST_TEST_THREADS diff --git a/diesel/Cargo.toml b/diesel/Cargo.toml index aa79356fef07..1a3bbe8a60fc 100644 --- a/diesel/Cargo.toml +++ b/diesel/Cargo.toml @@ -13,7 +13,7 @@ categories = ["database"] [dependencies] byteorder = "1.0" -diesel_derives2 = { path = "../diesel_derives2" } +diesel_derives = "~1.1.0" chrono = { version = "0.4", optional = true } clippy = { optional = true, version = "=0.0.185" } libc = { version = "0.2.0", optional = true } @@ -42,16 +42,16 @@ tempdir = "^0.3.4" [features] default = ["with-deprecated", "32-column-tables"] extras = ["chrono", "serde_json", "uuid", "deprecated-time", "network-address", "numeric", "r2d2"] -unstable = ["diesel_derives2/nightly"] +unstable = ["diesel_derives/nightly"] lint = ["clippy"] large-tables = ["32-column-tables"] huge-tables = ["64-column-tables"] 32-column-tables = [] 64-column-tables = ["32-column-tables"] 128-column-tables = ["64-column-tables"] -postgres = ["pq-sys", "bitflags", "diesel_derives2/postgres"] -sqlite = ["libsqlite3-sys", "diesel_derives2/sqlite"] -mysql = ["mysqlclient-sys", "url", "diesel_derives2/mysql"] +postgres = ["pq-sys", "bitflags", "diesel_derives/postgres"] +sqlite = ["libsqlite3-sys", "diesel_derives/sqlite"] +mysql = ["mysqlclient-sys", "url", "diesel_derives/mysql"] with-deprecated = [] deprecated-time = ["time"] network-address = ["ipnetwork", "libc"] diff --git a/diesel/src/lib.rs b/diesel/src/lib.rs index f3515dbff7f8..b15210c85f59 100644 --- a/diesel/src/lib.rs +++ b/diesel/src/lib.rs @@ -124,9 +124,9 @@ extern crate byteorder; #[cfg_attr(feature = "clippy", allow(useless_attribute))] #[allow(unused_imports)] #[macro_use] -extern crate diesel_derives2; +extern crate diesel_derives; #[doc(hidden)] -pub use diesel_derives2::*; +pub use diesel_derives::*; #[macro_use] mod macros; diff --git a/diesel_derives2/Cargo.toml b/diesel_derives/Cargo.toml similarity index 96% rename from diesel_derives2/Cargo.toml rename to diesel_derives/Cargo.toml index b7b7c6ed641f..b3e7cbff8641 100644 --- a/diesel_derives2/Cargo.toml +++ b/diesel_derives/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "diesel_derives2" +name = "diesel_derives" version = "1.1.0" authors = ["Sean Griffin "] license = "MIT OR Apache-2.0" diff --git a/diesel_derives2/src/as_changeset.rs b/diesel_derives/src/as_changeset.rs similarity index 100% rename from diesel_derives2/src/as_changeset.rs rename to diesel_derives/src/as_changeset.rs diff --git a/diesel_derives2/src/as_expression.rs b/diesel_derives/src/as_expression.rs similarity index 100% rename from diesel_derives2/src/as_expression.rs rename to diesel_derives/src/as_expression.rs diff --git a/diesel_derives2/src/associations.rs b/diesel_derives/src/associations.rs similarity index 100% rename from diesel_derives2/src/associations.rs rename to diesel_derives/src/associations.rs diff --git a/diesel_derives2/src/diagnostic_shim.rs b/diesel_derives/src/diagnostic_shim.rs similarity index 100% rename from diesel_derives2/src/diagnostic_shim.rs rename to diesel_derives/src/diagnostic_shim.rs diff --git a/diesel_derives2/src/field.rs b/diesel_derives/src/field.rs similarity index 100% rename from diesel_derives2/src/field.rs rename to diesel_derives/src/field.rs diff --git a/diesel_derives2/src/from_sql_row.rs b/diesel_derives/src/from_sql_row.rs similarity index 100% rename from diesel_derives2/src/from_sql_row.rs rename to diesel_derives/src/from_sql_row.rs diff --git a/diesel_derives2/src/identifiable.rs b/diesel_derives/src/identifiable.rs similarity index 100% rename from diesel_derives2/src/identifiable.rs rename to diesel_derives/src/identifiable.rs diff --git a/diesel_derives2/src/insertable.rs b/diesel_derives/src/insertable.rs similarity index 100% rename from diesel_derives2/src/insertable.rs rename to diesel_derives/src/insertable.rs diff --git a/diesel_derives2/src/lib.rs b/diesel_derives/src/lib.rs similarity index 100% rename from diesel_derives2/src/lib.rs rename to diesel_derives/src/lib.rs diff --git a/diesel_derives2/src/meta.rs b/diesel_derives/src/meta.rs similarity index 100% rename from diesel_derives2/src/meta.rs rename to diesel_derives/src/meta.rs diff --git a/diesel_derives2/src/model.rs b/diesel_derives/src/model.rs similarity index 100% rename from diesel_derives2/src/model.rs rename to diesel_derives/src/model.rs diff --git a/diesel_derives2/src/query_id.rs b/diesel_derives/src/query_id.rs similarity index 100% rename from diesel_derives2/src/query_id.rs rename to diesel_derives/src/query_id.rs diff --git a/diesel_derives2/src/queryable.rs b/diesel_derives/src/queryable.rs similarity index 100% rename from diesel_derives2/src/queryable.rs rename to diesel_derives/src/queryable.rs diff --git a/diesel_derives2/src/queryable_by_name.rs b/diesel_derives/src/queryable_by_name.rs similarity index 100% rename from diesel_derives2/src/queryable_by_name.rs rename to diesel_derives/src/queryable_by_name.rs diff --git a/diesel_derives2/src/sql_type.rs b/diesel_derives/src/sql_type.rs similarity index 100% rename from diesel_derives2/src/sql_type.rs rename to diesel_derives/src/sql_type.rs diff --git a/diesel_derives2/src/util.rs b/diesel_derives/src/util.rs similarity index 100% rename from diesel_derives2/src/util.rs rename to diesel_derives/src/util.rs diff --git a/diesel_derives2/tests/as_changeset.rs b/diesel_derives/tests/as_changeset.rs similarity index 100% rename from diesel_derives2/tests/as_changeset.rs rename to diesel_derives/tests/as_changeset.rs diff --git a/diesel_derives2/tests/associations.rs b/diesel_derives/tests/associations.rs similarity index 100% rename from diesel_derives2/tests/associations.rs rename to diesel_derives/tests/associations.rs diff --git a/diesel_derives2/tests/helpers.rs b/diesel_derives/tests/helpers.rs similarity index 100% rename from diesel_derives2/tests/helpers.rs rename to diesel_derives/tests/helpers.rs diff --git a/diesel_derives2/tests/identifiable.rs b/diesel_derives/tests/identifiable.rs similarity index 100% rename from diesel_derives2/tests/identifiable.rs rename to diesel_derives/tests/identifiable.rs diff --git a/diesel_derives2/tests/insertable.rs b/diesel_derives/tests/insertable.rs similarity index 100% rename from diesel_derives2/tests/insertable.rs rename to diesel_derives/tests/insertable.rs diff --git a/diesel_derives2/tests/queryable.rs b/diesel_derives/tests/queryable.rs similarity index 100% rename from diesel_derives2/tests/queryable.rs rename to diesel_derives/tests/queryable.rs diff --git a/diesel_derives2/tests/queryable_by_name.rs b/diesel_derives/tests/queryable_by_name.rs similarity index 100% rename from diesel_derives2/tests/queryable_by_name.rs rename to diesel_derives/tests/queryable_by_name.rs diff --git a/diesel_derives2/tests/schema.rs b/diesel_derives/tests/schema.rs similarity index 100% rename from diesel_derives2/tests/schema.rs rename to diesel_derives/tests/schema.rs diff --git a/diesel_derives2/tests/tests.rs b/diesel_derives/tests/tests.rs similarity index 100% rename from diesel_derives2/tests/tests.rs rename to diesel_derives/tests/tests.rs