From 3cc66f92b4e213543aa1527d5b983dd62bfa92e4 Mon Sep 17 00:00:00 2001 From: Ashley Mannix Date: Mon, 20 Feb 2017 19:33:09 +1000 Subject: [PATCH 1/5] update elastic_types --- Cargo.toml | 11 ++----- derive/.gitignore | 17 +++++++++++ derive/Cargo.toml | 13 ++++++++ derive/src/lib.rs | 46 +++++++++++++++++++++++++++++ examples/account_sample/Cargo.toml | 7 +---- examples/account_sample/src/main.rs | 2 +- examples/typed.rs | 2 +- src/client.rs | 2 +- src/lib.rs | 30 +++++++++---------- tests/mod.rs | 2 +- 10 files changed, 99 insertions(+), 33 deletions(-) create mode 100644 derive/.gitignore create mode 100644 derive/Cargo.toml create mode 100644 derive/src/lib.rs diff --git a/Cargo.toml b/Cargo.toml index c75566a72d..1b6f522380 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,17 +1,12 @@ [package] name = "elastic" -version = "0.8.0" +version = "0.9.0" authors = ["Ashley Mannix "] license = "Apache-2.0" description = "A client for the Elasticsearch REST API." documentation = "https://docs.rs/elastic/" repository = "https://github.com/elastic-rs/elastic" -[features] -nightly = [ - "elastic_types/nightly" -] - [dependencies] error-chain = "~0.7.0" serde = "~0.9.0" @@ -21,9 +16,9 @@ reqwest = "~0.4.0" elastic_reqwest = "~0.4.0" elastic_requests = "~0.1.7" elastic_responses = "~0.5.0" -elastic_types = "~0.11.1" +elastic_types = { version = "*", path = "../elastic-types/types" } [dev-dependencies] json_str = "^0.*" serde_derive = "~0.9.0" -elastic_types_derive = { version = "~0.12.0", features = ["elastic"] } \ No newline at end of file +elastic_derive = { version = "*", path = "derive" } \ No newline at end of file diff --git a/derive/.gitignore b/derive/.gitignore new file mode 100644 index 0000000000..50cf2edca8 --- /dev/null +++ b/derive/.gitignore @@ -0,0 +1,17 @@ +# Compiled files +*.o +*.so +*.rlib +*.dll +*.rs.bk + +# Executables +*.exe + +# Generated by Cargo +/target/ +Cargo.lock + +# Visual Studio +*.user +*.suo diff --git a/derive/Cargo.toml b/derive/Cargo.toml new file mode 100644 index 0000000000..ae65efb4f5 --- /dev/null +++ b/derive/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "elastic_derive" +version = "0.1.0" +authors = ["Ashley Mannix "] + +[lib] +name = "elastic_derive" +proc-macro = true + +[dependencies] +elastic_types_derive_internals = { version = "*", path = "../../elastic-types/types-derive-internals" } +syn = { version = "~0.11.0", features = ["aster", "visit", "parsing", "full"] } +quote = "~0.3.0" diff --git a/derive/src/lib.rs b/derive/src/lib.rs new file mode 100644 index 0000000000..a88a91ebf8 --- /dev/null +++ b/derive/src/lib.rs @@ -0,0 +1,46 @@ +//! Elasticsearch Codegen +//! +//! Compile-time code generation for Elasticsearch type implementations. +//! This crate provides custom `derive` attributes for data types in the [`elastic`](https://github.com/elastic-rs/elastic) crate. +//! +//! # Links +//! - [Github](https://github.com/elastic-rs/elastic) + +extern crate proc_macro; + +extern crate syn; +#[macro_use] +extern crate quote; +extern crate elastic_types_derive_internals as internals; + +use internals::{elastic_type, date_format}; + +#[proc_macro_derive(ElasticType, attributes(elastic))] +pub fn derive_elastic_type(input: proc_macro::TokenStream) -> proc_macro::TokenStream { + let mut expanded = quote::Tokens::new(); + let ast = syn::parse_macro_input(&input.to_string()).unwrap(); + + match elastic_type::expand_derive(quote!(::elastic::types), &ast) { + Ok(genned) => { + expanded.append_all(genned); + + expanded.to_string().parse().unwrap() + }, + Err(e) => panic!("{}", e) + } +} + +#[proc_macro_derive(ElasticDateFormat, attributes(elastic))] +pub fn derive_date_format(input: proc_macro::TokenStream) -> proc_macro::TokenStream { + let mut expanded = quote::Tokens::new(); + let ast = syn::parse_macro_input(&input.to_string()).unwrap(); + + match date_format::expand_derive(quote!(::elastic::types), &ast) { + Ok(genned) => { + expanded.append_all(genned); + + expanded.to_string().parse().unwrap() + }, + Err(e) => panic!("{}", e) + } +} diff --git a/examples/account_sample/Cargo.toml b/examples/account_sample/Cargo.toml index 0e4c5647fe..7661626604 100644 --- a/examples/account_sample/Cargo.toml +++ b/examples/account_sample/Cargo.toml @@ -3,14 +3,9 @@ name = "account-sample" version = "0.1.0" authors = ["Ashley Mannix "] -[features] -nightly = [ - "elastic/nightly" -] - [dependencies] elastic = { version = "*", path = "../../" } -elastic_types_derive = { version = "*", features = ["elastic"]} +elastic_derive = { version = "*", path = "../../derive" } quick-error = "*" serde = "0.9" diff --git a/examples/account_sample/src/main.rs b/examples/account_sample/src/main.rs index 69c35e8c5a..6f08a3ee11 100644 --- a/examples/account_sample/src/main.rs +++ b/examples/account_sample/src/main.rs @@ -5,7 +5,7 @@ #[macro_use] extern crate serde_derive; #[macro_use] -extern crate elastic_types_derive; +extern crate elastic_derive; #[macro_use] extern crate json_str; #[macro_use] diff --git a/examples/typed.rs b/examples/typed.rs index 17eacac2fc..27ca16bc17 100644 --- a/examples/typed.rs +++ b/examples/typed.rs @@ -13,7 +13,7 @@ #[macro_use] extern crate json_str; #[macro_use] -extern crate elastic_types_derive; +extern crate elastic_derive; #[macro_use] extern crate serde_derive; extern crate serde; diff --git a/src/client.rs b/src/client.rs index 77175cee08..020bdb94db 100644 --- a/src/client.rs +++ b/src/client.rs @@ -275,7 +275,7 @@ impl ResponseBuilder { /// # #[macro_use] /// # extern crate serde_derive; /// # #[macro_use] - /// # extern crate elastic_types_derive; + /// # extern crate elastic_derive; /// # extern crate elastic; /// # use elastic::prelude::*; /// # fn main() { diff --git a/src/lib.rs b/src/lib.rs index 9b34949a79..d22bac2a01 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -28,7 +28,7 @@ //! The following optional dependencies may also be useful: //! //! ```ignore -//! elastic_types_derive = { version = "*", features = ["elastic"] } +//! elastic_derive = "*" //! json_str = "*" //! serde = "*" //! serde_json = "*" @@ -46,7 +46,7 @@ //! #[macro_use] //! extern crate serde_derive; //! #[macro_use] -//! extern crate elastic_types_derive; +//! extern crate elastic_derive; //! #[macro_use] //! extern crate json_str; //! # fn main() {} @@ -107,7 +107,7 @@ //! # #[macro_use] //! # extern crate serde_derive; //! # #[macro_use] -//! # extern crate elastic_types_derive; +//! # extern crate elastic_derive; //! # extern crate elastic; //! # use elastic::prelude::*; //! # fn main() { @@ -133,7 +133,7 @@ //! # #[macro_use] //! # extern crate serde_derive; //! # #[macro_use] -//! # extern crate elastic_types_derive; +//! # extern crate elastic_derive; //! # extern crate elastic; //! # use elastic::prelude::*; //! # fn main() { @@ -161,7 +161,7 @@ //! # #[macro_use] //! # extern crate serde_derive; //! # #[macro_use] -//! # extern crate elastic_types_derive; +//! # extern crate elastic_derive; //! # extern crate elastic; //! # use elastic::prelude::*; //! # fn main() { @@ -181,7 +181,7 @@ //! # #[macro_use] //! # extern crate serde_derive; //! # #[macro_use] -//! # extern crate elastic_types_derive; +//! # extern crate elastic_derive; //! # extern crate elastic; //! # use elastic::prelude::*; //! # fn main() { @@ -212,7 +212,7 @@ //! # #[macro_use] //! # extern crate serde_derive; //! # #[macro_use] -//! # extern crate elastic_types_derive; +//! # extern crate elastic_derive; //! # extern crate elastic; //! # use elastic::prelude::*; //! # fn main() { @@ -363,7 +363,7 @@ pub mod types { //! ``` //! # extern crate elastic; //! # #[macro_use] - //! # extern crate elastic_types_derive; + //! # extern crate elastic_derive; //! # extern crate serde; //! # #[macro_use] //! # extern crate serde_derive; @@ -387,7 +387,7 @@ pub mod types { //! ``` //! # extern crate elastic; //! # #[macro_use] - //! # extern crate elastic_types_derive; + //! # extern crate elastic_derive; //! # extern crate serde; //! # extern crate serde_json; //! # #[macro_use] @@ -407,7 +407,7 @@ pub mod types { //! ``` //! # extern crate elastic; //! # #[macro_use] - //! # extern crate elastic_types_derive; + //! # extern crate elastic_derive; //! # extern crate serde; //! # extern crate serde_json; //! # #[macro_use] @@ -462,7 +462,7 @@ pub mod types { //! ``` //! # extern crate elastic; //! # #[macro_use] - //! # extern crate elastic_types_derive; + //! # extern crate elastic_derive; //! # extern crate serde; //! # #[macro_use] //! # extern crate serde_derive; @@ -485,7 +485,7 @@ pub mod types { //! ``` //! # extern crate elastic; //! # #[macro_use] - //! # extern crate elastic_types_derive; + //! # extern crate elastic_derive; //! # extern crate serde; //! # #[macro_use] //! # extern crate serde_derive; @@ -506,7 +506,7 @@ pub mod types { //! ``` //! # extern crate elastic; //! # #[macro_use] - //! # extern crate elastic_types_derive; + //! # extern crate elastic_derive; //! # extern crate serde; //! # #[macro_use] //! # extern crate serde_derive; @@ -546,7 +546,7 @@ pub mod types { //! ``` //! # extern crate elastic; //! # #[macro_use] - //! # extern crate elastic_types_derive; + //! # extern crate elastic_derive; //! # extern crate serde; //! # extern crate serde_json; //! # #[macro_use] @@ -570,7 +570,7 @@ pub mod types { //! ``` //! # extern crate elastic; //! # #[macro_use] - //! # extern crate elastic_types_derive; + //! # extern crate elastic_derive; //! # extern crate serde; //! # extern crate serde_json; //! # #[macro_use] diff --git a/tests/mod.rs b/tests/mod.rs index cd8c072788..8639e0c944 100644 --- a/tests/mod.rs +++ b/tests/mod.rs @@ -1,5 +1,5 @@ #[macro_use] -extern crate elastic_types_derive; +extern crate elastic_derive; #[macro_use] extern crate serde_derive; extern crate serde; From 18ef31b66285db4b3bf37e15ec8824a9c2c96f95 Mon Sep 17 00:00:00 2001 From: Ashley Mannix Date: Mon, 20 Feb 2017 19:38:21 +1000 Subject: [PATCH 2/5] update travis build --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6bc54e5350..3c5371cc63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,9 @@ before_script: script: - | travis-cargo test && - cd examples/account_sample && + cd derive && + travis-cargo test && + cd ../examples/account_sample && travis-cargo test && cd ../../benches/rust/elastic && travis-cargo --only nightly build && From 11d9bc16a317c9d31d3e915437af56098d330c87 Mon Sep 17 00:00:00 2001 From: Ashley Mannix Date: Mon, 20 Feb 2017 20:26:53 +1000 Subject: [PATCH 3/5] use stable codegen internals --- Cargo.toml | 2 +- derive/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1b6f522380..16406b6583 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ reqwest = "~0.4.0" elastic_reqwest = "~0.4.0" elastic_requests = "~0.1.7" elastic_responses = "~0.5.0" -elastic_types = { version = "*", path = "../elastic-types/types" } +elastic_types = "~0.13.0" [dev-dependencies] json_str = "^0.*" diff --git a/derive/Cargo.toml b/derive/Cargo.toml index ae65efb4f5..8f95b8ea5a 100644 --- a/derive/Cargo.toml +++ b/derive/Cargo.toml @@ -8,6 +8,6 @@ name = "elastic_derive" proc-macro = true [dependencies] -elastic_types_derive_internals = { version = "*", path = "../../elastic-types/types-derive-internals" } +elastic_types_derive_internals = "~0.1.0" syn = { version = "~0.11.0", features = ["aster", "visit", "parsing", "full"] } quote = "~0.3.0" From 8262cd14261b3073afe0df7fe5458d01e6fa0937 Mon Sep 17 00:00:00 2001 From: Ashley Mannix Date: Mon, 20 Feb 2017 20:43:55 +1000 Subject: [PATCH 4/5] rework ci --- .gitignore | 1 - .travis.yml | 43 +++++++++++++------ README.md | 1 + appveyor.yml | 1 + benches/rust/elastic-raw/.gitignore | 4 +- benches/rust/elastic-raw/Cargo.toml | 2 +- benches/rust/elastic/.gitignore | 4 +- benches/rust/elastic/Cargo.toml | 2 +- derive/.gitignore | 21 ++------- elastic/.gitignore | 4 ++ Cargo.toml => elastic/Cargo.toml | 2 +- elastic/examples/account_sample/.gitignore | 4 ++ .../examples}/account_sample/Cargo.toml | 0 .../examples}/account_sample/README.md | 0 .../account_sample/data/accounts.json | 0 .../examples}/account_sample/src/main.rs | 0 .../account_sample/src/model/account.rs | 0 .../account_sample/src/model/index.rs | 0 .../examples}/account_sample/src/model/mod.rs | 0 .../ops/commands/ensure_bank_index_exists.rs | 0 .../account_sample/src/ops/commands/mod.rs | 0 .../src/ops/commands/put_bulk_accounts.rs | 0 .../examples}/account_sample/src/ops/mod.rs | 0 .../account_sample/src/ops/queries/mod.rs | 0 .../src/ops/queries/simple_search.rs | 0 {examples => elastic/examples}/basic.rs | 0 {examples => elastic/examples}/raw.rs | 0 {examples => elastic/examples}/typed.rs | 0 {src => elastic/src}/client.rs | 0 {src => elastic/src}/error.rs | 0 {src => elastic/src}/impls.rs | 0 {src => elastic/src}/lib.rs | 0 {tests => elastic/tests}/mod.rs | 0 examples/account_sample/.gitignore | 1 - 34 files changed, 50 insertions(+), 40 deletions(-) create mode 100644 elastic/.gitignore rename Cargo.toml => elastic/Cargo.toml (91%) create mode 100644 elastic/examples/account_sample/.gitignore rename {examples => elastic/examples}/account_sample/Cargo.toml (100%) rename {examples => elastic/examples}/account_sample/README.md (100%) rename {examples => elastic/examples}/account_sample/data/accounts.json (100%) rename {examples => elastic/examples}/account_sample/src/main.rs (100%) rename {examples => elastic/examples}/account_sample/src/model/account.rs (100%) rename {examples => elastic/examples}/account_sample/src/model/index.rs (100%) rename {examples => elastic/examples}/account_sample/src/model/mod.rs (100%) rename {examples => elastic/examples}/account_sample/src/ops/commands/ensure_bank_index_exists.rs (100%) rename {examples => elastic/examples}/account_sample/src/ops/commands/mod.rs (100%) rename {examples => elastic/examples}/account_sample/src/ops/commands/put_bulk_accounts.rs (100%) rename {examples => elastic/examples}/account_sample/src/ops/mod.rs (100%) rename {examples => elastic/examples}/account_sample/src/ops/queries/mod.rs (100%) rename {examples => elastic/examples}/account_sample/src/ops/queries/simple_search.rs (100%) rename {examples => elastic/examples}/basic.rs (100%) rename {examples => elastic/examples}/raw.rs (100%) rename {examples => elastic/examples}/typed.rs (100%) rename {src => elastic/src}/client.rs (100%) rename {src => elastic/src}/error.rs (100%) rename {src => elastic/src}/impls.rs (100%) rename {src => elastic/src}/lib.rs (100%) rename {tests => elastic/tests}/mod.rs (100%) delete mode 100644 examples/account_sample/.gitignore diff --git a/.gitignore b/.gitignore index 50cf2edca8..be1202d417 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ *.exe # Generated by Cargo -/target/ Cargo.lock # Visual Studio diff --git a/.travis.yml b/.travis.yml index 3c5371cc63..aa8db33d8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,31 @@ addons: - libdw-dev - binutils-dev # optional: only required for the --verify flag of coveralls -rust: - - nightly +matrix: + include: + - rust: stable + env: + - CRATE="derive" + - rust: stable + env: + - CRATE="elastic/examples/account_sample" + - rust: stable + env: + - CRATE="elastic" + + - rust: nightly + env: + - CRATE="derive" + - rust: nightly + env: + - CRATE="elastic/examples/account_sample" + - rust: nightly + env: + - CRATE="benches/rust/elastic" + - rust: nightly + env: + - CRATE="elastic" + - DOC_UPLOAD=true env: global: @@ -22,16 +45,8 @@ before_script: script: - | + cd $CRATE && travis-cargo test && - cd derive && - travis-cargo test && - cd ../examples/account_sample && - travis-cargo test && - cd ../../benches/rust/elastic && - travis-cargo --only nightly build && - cd ../elastic-raw && - travis-cargo --only nightly build && - cd ../../../ && - travis-cargo doc -after_success: - - travis-cargo doc-upload \ No newline at end of file + travis-cargo --only nightly bench && + travis-cargo --only nightly doc && + if [ $DOC_UPLOAD ]; then travis-cargo --only nightly doc-upload; fi \ No newline at end of file diff --git a/README.md b/README.md index 559b65aaac..476fa91ea6 100644 --- a/README.md +++ b/README.md @@ -53,6 +53,7 @@ Add `elastic` and `json_str` to your `Cargo.toml`: elastic = "*" # Optional +elastic_derive = "*" serde_json = "*" json_str = "*" ``` diff --git a/appveyor.yml b/appveyor.yml index 3d249e9f59..d21598c719 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,4 +12,5 @@ install: - cargo -vV build: false test_script: + - ps: cd elastic - cargo test --verbose --no-default-features diff --git a/benches/rust/elastic-raw/.gitignore b/benches/rust/elastic-raw/.gitignore index b1aef56e93..2e1a93efa2 100644 --- a/benches/rust/elastic-raw/.gitignore +++ b/benches/rust/elastic-raw/.gitignore @@ -1,4 +1,4 @@ *.bk perf.* -/target/ -/obj/ \ No newline at end of file +target/ +obj/ \ No newline at end of file diff --git a/benches/rust/elastic-raw/Cargo.toml b/benches/rust/elastic-raw/Cargo.toml index 2eada26687..5667467777 100644 --- a/benches/rust/elastic-raw/Cargo.toml +++ b/benches/rust/elastic-raw/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Ashley Mannix "] [dependencies] json_str = { version = "*", features = ["nightly"]} -elastic = { version = "*", path = "../../../", features = ["nightly"] } +elastic = { version = "*", path = "../../../elastic" } lazy_static = "*" time = "*" diff --git a/benches/rust/elastic/.gitignore b/benches/rust/elastic/.gitignore index b1aef56e93..2e1a93efa2 100644 --- a/benches/rust/elastic/.gitignore +++ b/benches/rust/elastic/.gitignore @@ -1,4 +1,4 @@ *.bk perf.* -/target/ -/obj/ \ No newline at end of file +target/ +obj/ \ No newline at end of file diff --git a/benches/rust/elastic/Cargo.toml b/benches/rust/elastic/Cargo.toml index a2642774c0..581a1cf9c1 100644 --- a/benches/rust/elastic/Cargo.toml +++ b/benches/rust/elastic/Cargo.toml @@ -8,7 +8,7 @@ serde = "*" serde_derive = "*" json_str = { version = "*", features = ["nightly"]} -elastic = { version = "*", path = "../../../", features = ["nightly"] } +elastic = { version = "*", path = "../../../elastic" } lazy_static = "*" time = "*" diff --git a/derive/.gitignore b/derive/.gitignore index 50cf2edca8..2e1a93efa2 100644 --- a/derive/.gitignore +++ b/derive/.gitignore @@ -1,17 +1,4 @@ -# Compiled files -*.o -*.so -*.rlib -*.dll -*.rs.bk - -# Executables -*.exe - -# Generated by Cargo -/target/ -Cargo.lock - -# Visual Studio -*.user -*.suo +*.bk +perf.* +target/ +obj/ \ No newline at end of file diff --git a/elastic/.gitignore b/elastic/.gitignore new file mode 100644 index 0000000000..2e1a93efa2 --- /dev/null +++ b/elastic/.gitignore @@ -0,0 +1,4 @@ +*.bk +perf.* +target/ +obj/ \ No newline at end of file diff --git a/Cargo.toml b/elastic/Cargo.toml similarity index 91% rename from Cargo.toml rename to elastic/Cargo.toml index 16406b6583..083778a2f2 100644 --- a/Cargo.toml +++ b/elastic/Cargo.toml @@ -21,4 +21,4 @@ elastic_types = "~0.13.0" [dev-dependencies] json_str = "^0.*" serde_derive = "~0.9.0" -elastic_derive = { version = "*", path = "derive" } \ No newline at end of file +elastic_derive = { version = "*", path = "../derive" } \ No newline at end of file diff --git a/elastic/examples/account_sample/.gitignore b/elastic/examples/account_sample/.gitignore new file mode 100644 index 0000000000..2e1a93efa2 --- /dev/null +++ b/elastic/examples/account_sample/.gitignore @@ -0,0 +1,4 @@ +*.bk +perf.* +target/ +obj/ \ No newline at end of file diff --git a/examples/account_sample/Cargo.toml b/elastic/examples/account_sample/Cargo.toml similarity index 100% rename from examples/account_sample/Cargo.toml rename to elastic/examples/account_sample/Cargo.toml diff --git a/examples/account_sample/README.md b/elastic/examples/account_sample/README.md similarity index 100% rename from examples/account_sample/README.md rename to elastic/examples/account_sample/README.md diff --git a/examples/account_sample/data/accounts.json b/elastic/examples/account_sample/data/accounts.json similarity index 100% rename from examples/account_sample/data/accounts.json rename to elastic/examples/account_sample/data/accounts.json diff --git a/examples/account_sample/src/main.rs b/elastic/examples/account_sample/src/main.rs similarity index 100% rename from examples/account_sample/src/main.rs rename to elastic/examples/account_sample/src/main.rs diff --git a/examples/account_sample/src/model/account.rs b/elastic/examples/account_sample/src/model/account.rs similarity index 100% rename from examples/account_sample/src/model/account.rs rename to elastic/examples/account_sample/src/model/account.rs diff --git a/examples/account_sample/src/model/index.rs b/elastic/examples/account_sample/src/model/index.rs similarity index 100% rename from examples/account_sample/src/model/index.rs rename to elastic/examples/account_sample/src/model/index.rs diff --git a/examples/account_sample/src/model/mod.rs b/elastic/examples/account_sample/src/model/mod.rs similarity index 100% rename from examples/account_sample/src/model/mod.rs rename to elastic/examples/account_sample/src/model/mod.rs diff --git a/examples/account_sample/src/ops/commands/ensure_bank_index_exists.rs b/elastic/examples/account_sample/src/ops/commands/ensure_bank_index_exists.rs similarity index 100% rename from examples/account_sample/src/ops/commands/ensure_bank_index_exists.rs rename to elastic/examples/account_sample/src/ops/commands/ensure_bank_index_exists.rs diff --git a/examples/account_sample/src/ops/commands/mod.rs b/elastic/examples/account_sample/src/ops/commands/mod.rs similarity index 100% rename from examples/account_sample/src/ops/commands/mod.rs rename to elastic/examples/account_sample/src/ops/commands/mod.rs diff --git a/examples/account_sample/src/ops/commands/put_bulk_accounts.rs b/elastic/examples/account_sample/src/ops/commands/put_bulk_accounts.rs similarity index 100% rename from examples/account_sample/src/ops/commands/put_bulk_accounts.rs rename to elastic/examples/account_sample/src/ops/commands/put_bulk_accounts.rs diff --git a/examples/account_sample/src/ops/mod.rs b/elastic/examples/account_sample/src/ops/mod.rs similarity index 100% rename from examples/account_sample/src/ops/mod.rs rename to elastic/examples/account_sample/src/ops/mod.rs diff --git a/examples/account_sample/src/ops/queries/mod.rs b/elastic/examples/account_sample/src/ops/queries/mod.rs similarity index 100% rename from examples/account_sample/src/ops/queries/mod.rs rename to elastic/examples/account_sample/src/ops/queries/mod.rs diff --git a/examples/account_sample/src/ops/queries/simple_search.rs b/elastic/examples/account_sample/src/ops/queries/simple_search.rs similarity index 100% rename from examples/account_sample/src/ops/queries/simple_search.rs rename to elastic/examples/account_sample/src/ops/queries/simple_search.rs diff --git a/examples/basic.rs b/elastic/examples/basic.rs similarity index 100% rename from examples/basic.rs rename to elastic/examples/basic.rs diff --git a/examples/raw.rs b/elastic/examples/raw.rs similarity index 100% rename from examples/raw.rs rename to elastic/examples/raw.rs diff --git a/examples/typed.rs b/elastic/examples/typed.rs similarity index 100% rename from examples/typed.rs rename to elastic/examples/typed.rs diff --git a/src/client.rs b/elastic/src/client.rs similarity index 100% rename from src/client.rs rename to elastic/src/client.rs diff --git a/src/error.rs b/elastic/src/error.rs similarity index 100% rename from src/error.rs rename to elastic/src/error.rs diff --git a/src/impls.rs b/elastic/src/impls.rs similarity index 100% rename from src/impls.rs rename to elastic/src/impls.rs diff --git a/src/lib.rs b/elastic/src/lib.rs similarity index 100% rename from src/lib.rs rename to elastic/src/lib.rs diff --git a/tests/mod.rs b/elastic/tests/mod.rs similarity index 100% rename from tests/mod.rs rename to elastic/tests/mod.rs diff --git a/examples/account_sample/.gitignore b/examples/account_sample/.gitignore deleted file mode 100644 index eb5a316cbd..0000000000 --- a/examples/account_sample/.gitignore +++ /dev/null @@ -1 +0,0 @@ -target From 2a6371ba9d25360e0b9662ce6ab5c37a2c581a9d Mon Sep 17 00:00:00 2001 From: Ashley Mannix Date: Mon, 20 Feb 2017 20:50:18 +1000 Subject: [PATCH 5/5] update path to derive --- elastic/examples/account_sample/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elastic/examples/account_sample/Cargo.toml b/elastic/examples/account_sample/Cargo.toml index 7661626604..2be909ea11 100644 --- a/elastic/examples/account_sample/Cargo.toml +++ b/elastic/examples/account_sample/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Ashley Mannix "] [dependencies] elastic = { version = "*", path = "../../" } -elastic_derive = { version = "*", path = "../../derive" } +elastic_derive = { version = "*", path = "../../../derive" } quick-error = "*" serde = "0.9"