Skip to content

Commit df3f820

Browse files
KodrAusKodrAus
committed
prepare for 0.21.0-pre.2 release
1 parent ad94124 commit df3f820

File tree

23 files changed

+142
-94
lines changed

23 files changed

+142
-94
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ Add `elastic` to your `Cargo.toml`:
3434

3535
```toml
3636
[dependencies]
37-
elastic = "0.21.0-pre.1"
38-
elastic_derive = "0.21.0-pre.1"
37+
elastic = "0.21.0-pre.2"
38+
elastic_derive = "0.21.0-pre.2"
3939
serde_json = "1"
4040
```
4141

‎examples/account_sample/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ authors = ["Ashley Mannix <[email protected]>"]
55
publish = false
66

77
[dependencies]
8-
elastic = { version = "~0.21.0-pre.1", path = "../../src/elastic" }
9-
elastic_derive = { version = "~0.21.0-pre.1", path = "../../src/elastic_derive" }
8+
elastic = { version = "~0.21.0-pre.2", path = "../../src/elastic" }
9+
elastic_derive = { version = "~0.21.0-pre.2", path = "../../src/elastic_derive" }
1010

11-
quick-error = "*"
12-
serde = "*"
13-
serde_json = "*"
14-
serde_derive = "*"
11+
quick-error = "~1"
12+
serde = "~1"
13+
serde_json = "~1"
14+
serde_derive = "~1"

‎src/elastic/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "elastic"
3-
version = "0.21.0-pre.1"
3+
version = "0.21.0-pre.2"
44
authors = ["Ashley Mannix <[email protected]>"]
55
license = "MIT/Apache-2.0"
66
keywords = ["elasticsearch", "search"]
@@ -31,12 +31,12 @@ tokio-threadpool = "~0.1"
3131
fluent_builder = "~0.5"
3232
crossbeam-channel = "~0.3"
3333

34-
elastic_requests = { version = "~0.21.0-pre.1", path = "../requests" }
35-
elastic_responses = { version = "~0.21.0-pre.1", path = "../responses" }
36-
elastic_types = { version = "~0.21.0-pre.1", path = "../types" }
34+
elastic_requests = { version = "~0.21.0-pre.2", path = "../requests" }
35+
elastic_responses = { version = "~0.21.0-pre.2", path = "../responses" }
36+
elastic_types = { version = "~0.21.0-pre.2", path = "../types" }
3737

3838
[dev-dependencies]
3939
json_str = "~0.5"
4040
serde_derive = "~1"
41-
elastic_derive = { version = "~0.21.0-pre.1", path = "../elastic_derive" }
41+
elastic_derive = { version = "~0.21.0-pre.2", path = "../elastic_derive" }
4242
env_logger = "~0.6"

‎src/elastic/src/client/requests/bulk/stream.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,9 @@ where
294294
BulkSenderInFlight::ReadyToSend => {
295295
match self.timeout.poll() {
296296
// If the timeout hasn't expired and the body isn't full then we're not ready
297-
Ok(Async::NotReady) if !self.body.is_full() && !self.body.is_empty() => return Ok(Async::NotReady),
297+
Ok(Async::NotReady) if !self.body.is_full() && !self.body.is_empty() => {
298+
return Ok(Async::NotReady);
299+
}
298300
// Continue
299301
Ok(Async::NotReady) => (),
300302
// Restart the expired timer

‎src/elastic/src/client/sender/async.rs

+11-5
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,10 @@ pub struct AsyncSender {
9494
pre_send: Option<
9595
Arc<
9696
Fn(
97-
&mut AsyncHttpRequest,
98-
) -> Box<Future<Item = (), Error = Box<StdError + Send + Sync>>> + Send + Sync,
97+
&mut AsyncHttpRequest,
98+
) -> Box<Future<Item = (), Error = Box<StdError + Send + Sync>>>
99+
+ Send
100+
+ Sync,
99101
>,
100102
>,
101103
}
@@ -328,8 +330,10 @@ pub struct AsyncClientBuilder {
328330
pre_send: Option<
329331
Arc<
330332
Fn(
331-
&mut AsyncHttpRequest,
332-
) -> Box<Future<Item = (), Error = Box<StdError + Send + Sync>>> + Send + Sync,
333+
&mut AsyncHttpRequest,
334+
) -> Box<Future<Item = (), Error = Box<StdError + Send + Sync>>>
335+
+ Send
336+
+ Sync,
333337
>,
334338
>,
335339
}
@@ -524,7 +528,9 @@ impl AsyncClientBuilder {
524528
pre_send: impl Fn(
525529
&mut AsyncHttpRequest,
526530
) -> Box<Future<Item = (), Error = Box<StdError + Send + Sync>>>
527-
+ Send + Sync + 'static,
531+
+ Send
532+
+ Sync
533+
+ 'static,
528534
) -> Self {
529535
self.pre_send = Some(Arc::new(pre_send));
530536

‎src/elastic/src/lib.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ To get stated, add `elastic` to your `Cargo.toml`:
2525
2626
```ignore
2727
[dependencies]
28-
elastic = "*"
29-
elastic_derive = "*"
28+
elastic = "~0.21.0-pre.2"
29+
elastic_derive = "~0.21.0-pre.2"
3030
```
3131
3232
The following optional dependencies may also be useful:
3333
3434
```ignore
35-
serde = "*"
36-
serde_json = "*"
37-
serde_derive = "*"
35+
serde = "~1"
36+
serde_json = "~1"
37+
serde_derive = "~1"
3838
```
3939
4040
Then reference in your crate root:

‎src/elastic_derive/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "elastic_derive"
3-
version = "0.21.0-pre.1"
3+
version = "0.21.0-pre.2"
44
authors = ["Ashley Mannix <[email protected]>"]
55
license = "MIT/Apache-2.0"
66
description = "Compile-time code generation for Elasticsearch type implementations."
@@ -11,6 +11,6 @@ name = "elastic_derive"
1111
proc-macro = true
1212

1313
[dependencies]
14-
elastic_types_derive_internals = { version = "~0.21.0-pre.1", path = "../types_derive_internals" }
14+
elastic_types_derive_internals = { version = "~0.21.0-pre.2", path = "../types_derive_internals" }
1515
syn = { version = "~0.11.0", features = ["aster", "visit", "parsing", "full"] }
1616
quote = "~0.3.0"

‎src/requests/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "elastic_requests"
3-
version = "0.21.0-pre.1"
3+
version = "0.21.0-pre.2"
44
authors = ["Ashley Mannix <[email protected]>"]
55
license = "MIT/Apache-2.0"
66
description = "Code generated request types for the Elasticsearch REST API."

‎src/responses/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
authors = ["Stephan Buys <[email protected]>", "Ashley Mannix <[email protected]>"]
33
name = "elastic_responses"
4-
version = "0.21.0-pre.1"
4+
version = "0.21.0-pre.2"
55
license = "MIT/Apache-2.0"
66
description = "Parses search results from Elasticsearch and presents results using convenient iterators."
77
documentation = "https://docs.rs/elastic_responses"

‎src/responses/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Add `elastic_responses` to your `Cargo.toml`:
1616
1717
```text
1818
[dependencies]
19-
elastic_responses = "*"
19+
elastic_responses = "~0.21.0-pre.2"
2020
```
2121
2222
Use the [`parse`][parse] function to deserialise a http response to a `Result<T, ApiError>` for some

‎src/types/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "elastic_types"
3-
version = "0.21.0-pre.1"
3+
version = "0.21.0-pre.2"
44
authors = ["Ashley Mannix <[email protected]>"]
55
license = "MIT/Apache-2.0"
66
description = "A strongly-typed implementation of Elasticsearch core types and Mapping API."
@@ -16,7 +16,7 @@ geohash = "~0.4.0"
1616
geojson = "~0.9.0"
1717
serde_derive = "~1"
1818
# TODO: Move this to a `dev-dependency`
19-
elastic_types_derive = { version = "~0.21.0-pre.1", path = "../types_derive" }
19+
elastic_types_derive = { version = "~0.21.0-pre.2", path = "../types_derive" }
2020

2121
[dev-dependencies]
2222
json_str = "^0.*"

‎src/types/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ To get started, add `elastic_types` and `elastic_types_derive` to your `Cargo.to
2424
2525
```ignore
2626
[dependencies]
27-
elastic_types = version = "~0.21.0-pre.1"
28-
elastic_types_derive = "*"
27+
elastic_types = version = "~0.21.0-pre.2"
28+
elastic_types_derive = "~0.21.0-pre.2"
2929
```
3030
3131
And reference it in your crate root:
@@ -324,8 +324,8 @@ Our `Cargo.toml` specifies the dependencies as above:
324324
325325
```ignore
326326
[dependencies]
327-
elastic_types = "*"
328-
elastic_types_derive = "*"
327+
elastic_types = "~0.21.0-pre.2"
328+
elastic_types_derive = "~0.21.0-pre.2"
329329
```
330330
331331
And our `main.rs` contains the following:

‎src/types/tests/derive_compile_test/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ authors = ["Ashley Mannix <[email protected]>"]
55
publish = false
66

77
[dependencies]
8-
elastic_types = { version = "~0.21.0-pre.1", path = "../../" }
9-
elastic_types_derive = { version = "~0.21.0-pre.1", path = "../../../types_derive" }
8+
elastic_types = { version = "~0.21.0-pre.2", path = "../../" }
9+
elastic_types_derive = { version = "~0.21.0-pre.2", path = "../../../types_derive" }

‎src/types_derive/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "elastic_types_derive"
3-
version = "0.21.0-pre.1"
3+
version = "0.21.0-pre.2"
44
authors = ["Ashley Mannix <[email protected]>"]
55
license = "MIT/Apache-2.0"
66
description = "Compile-time code generation for Elasticsearch type implementations."
@@ -11,6 +11,6 @@ name = "elastic_types_derive"
1111
proc-macro = true
1212

1313
[dependencies]
14-
elastic_types_derive_internals = { version = "~0.21.0-pre.1", path = "../types_derive_internals" }
14+
elastic_types_derive_internals = { version = "~0.21.0-pre.2", path = "../types_derive_internals" }
1515
syn = { version = "~0.11.0", features = ["full"] }
1616
quote = "~0.3.0"

‎src/types_derive_internals/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "elastic_types_derive_internals"
3-
version = "0.21.0-pre.1"
3+
version = "0.21.0-pre.2"
44
authors = ["Ashley Mannix <[email protected]>"]
55
license = "MIT/Apache-2.0"
66
description = "Codegen internals for elastic_types."

‎tests/run/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ authors = ["Ashley Mannix <[email protected]>"]
55
publish = false
66

77
[dependencies]
8-
elastic = { version = "~0.21.0-pre.1", path = "../../src/elastic" }
9-
elastic_derive = { version = "~0.21.0-pre.1", path = "../../src/elastic_derive" }
8+
elastic = { version = "~0.21.0-pre.2", path = "../../src/elastic" }
9+
elastic_derive = { version = "~0.21.0-pre.2", path = "../../src/elastic_derive" }
1010

1111
serde = "~1"
1212
serde_derive = "~1"

‎tests/run/src/bulk/index_get.rs

+12-6
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,24 @@ impl IntegrationTest for IndexGet {
2727

2828
// Ensure the index doesn't exist
2929
fn prepare(&self, client: AsyncClient) -> Box<Future<Item = (), Error = Error>> {
30-
let delete_res = client.index(Doc::static_index()).delete().send().map(|_| ());
30+
let delete_res = client
31+
.index(Doc::static_index())
32+
.delete()
33+
.send()
34+
.map(|_| ());
3135

3236
Box::new(delete_res)
3337
}
3438

3539
// Index some bulk documents
3640
fn request(&self, client: AsyncClient) -> Box<Future<Item = Self::Response, Error = Error>> {
37-
let ops = (0..10).into_iter().map(|i| bulk().index(Doc {
38-
id: i.to_string(),
39-
title: "A document title".to_owned(),
40-
timestamp: Date::build(2017, 03, 24, 13, 44, 0, 0),
41-
}));
41+
let ops = (0..10).into_iter().map(|i| {
42+
bulk().index(Doc {
43+
id: i.to_string(),
44+
title: "A document title".to_owned(),
45+
timestamp: Date::build(2017, 03, 24, 13, 44, 0, 0),
46+
})
47+
});
4248

4349
let bulk_res = client
4450
.bulk()

‎tests/run/src/bulk/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ use run_tests::{
44
};
55

66
mod delete;
7-
mod index_get;
87
mod index_create;
8+
mod index_get;
99
mod stream;
1010
mod stream_tiny_size_limit;
11-
mod stream_zero_size_limit;
1211
mod stream_tiny_timeout;
12+
mod stream_zero_size_limit;
1313

1414
pub fn tests() -> Vec<Test> {
1515
vec![

‎tests/run/src/bulk/stream.rs

+24-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
use elastic::client::responses::bulk::OkItem;
12
use elastic::error::Error;
23
use elastic::prelude::*;
3-
use elastic::client::responses::bulk::OkItem;
4-
use futures::{stream, Stream, Sink, Future};
4+
use futures::{
5+
stream,
6+
Future,
7+
Sink,
8+
Stream,
9+
};
510
use run_tests::IntegrationTest;
611

712
#[derive(Debug, Clone, Copy)]
@@ -43,20 +48,26 @@ impl IntegrationTest for BulkStream {
4348

4449
// Stream some bulk operations
4550
fn request(&self, client: AsyncClient) -> Box<Future<Item = Self::Response, Error = Error>> {
46-
let (bulk_stream, bulk_responses) = client
47-
.bulk_stream()
48-
.build();
49-
50-
let ops = (0..20).into_iter().map(|i| bulk().index(Doc { id: i.to_string() }));
51+
let (bulk_stream, bulk_responses) = client.bulk_stream().build();
52+
53+
let ops = (0..20)
54+
.into_iter()
55+
.map(|i| bulk().index(Doc { id: i.to_string() }));
5156

5257
let req_future = bulk_stream.send_all(stream::iter_ok(ops));
5358

54-
let res_future = bulk_responses.fold(BulkResult { requests: 0, ops: Vec::new() }, |mut res, bulk| {
55-
res.requests += 1;
56-
res.ops.extend(bulk.into_iter().filter_map(Result::ok));
57-
58-
Ok(res)
59-
});
59+
let res_future = bulk_responses.fold(
60+
BulkResult {
61+
requests: 0,
62+
ops: Vec::new(),
63+
},
64+
|mut res, bulk| {
65+
res.requests += 1;
66+
res.ops.extend(bulk.into_iter().filter_map(Result::ok));
67+
68+
Ok(res)
69+
},
70+
);
6071

6172
Box::new(req_future.join(res_future).map(|(_, ops)| ops))
6273
}

‎tests/run/src/bulk/stream_tiny_size_limit.rs

+13-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
use elastic::client::responses::bulk::OkItem;
12
use elastic::error::Error;
23
use elastic::prelude::*;
3-
use elastic::client::responses::bulk::OkItem;
4-
use futures::{stream, Stream, Sink, Future};
4+
use futures::{
5+
stream,
6+
Future,
7+
Sink,
8+
Stream,
9+
};
510
use run_tests::IntegrationTest;
611

712
#[derive(Debug, Clone, Copy)]
@@ -37,18 +42,17 @@ impl IntegrationTest for BulkStreamTinySize {
3742

3843
// Stream some bulk operations
3944
fn request(&self, client: AsyncClient) -> Box<Future<Item = Self::Response, Error = Error>> {
40-
let (bulk_stream, bulk_responses) = client
41-
.bulk_stream()
42-
.body_size_bytes(1)
43-
.build();
44-
45-
let ops = (0..20).into_iter().map(|i| bulk().index(Doc { id: i.to_string() }));
45+
let (bulk_stream, bulk_responses) = client.bulk_stream().body_size_bytes(1).build();
46+
47+
let ops = (0..20)
48+
.into_iter()
49+
.map(|i| bulk().index(Doc { id: i.to_string() }));
4650

4751
let req_future = bulk_stream.send_all(stream::iter_ok(ops));
4852

4953
let res_future = bulk_responses.fold(Vec::new(), |mut ops, bulk| {
5054
ops.extend(bulk.into_iter().filter_map(Result::ok));
51-
55+
5256
Ok(ops)
5357
});
5458

0 commit comments

Comments
 (0)