Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to recycle to finally build on stable #88

Merged
merged 2 commits into from
Jul 18, 2020
Merged

Switch to recycle to finally build on stable #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6ba075
vec-utils -> recycle
alecmocatta Jul 18, 2020
ac80472
v0.3.4
alecmocatta Jul 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[package]
name = "amadeus"
version = "0.3.3"
version = "0.3.4"
license = "Apache-2.0"
authors = ["Alec Mocatta <alec@mocatta.net>"]
categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"]
Expand Down Expand Up @@ -35,14 +35,14 @@ json = ["amadeus-serde", "amadeus-derive/serde"]
features = ["constellation", "aws", "commoncrawl", "parquet", "postgres", "csv", "json"]

[dependencies]
amadeus-core = { version = "=0.3.3", path = "amadeus-core" }
amadeus-derive = { version = "=0.3.3", path = "amadeus-derive" }
amadeus-types = { version = "=0.3.3", path = "amadeus-types" }
amadeus-aws = { version = "=0.3.3", path = "amadeus-aws", optional = true }
amadeus-commoncrawl = { version = "=0.3.3", path = "amadeus-commoncrawl", optional = true }
amadeus-parquet = { version = "=0.3.3", path = "amadeus-parquet", optional = true }
amadeus-postgres = { version = "=0.3.3", path = "amadeus-postgres", optional = true }
amadeus-serde = { version = "=0.3.3", path = "amadeus-serde", optional = true }
amadeus-core = { version = "=0.3.4", path = "amadeus-core" }
amadeus-derive = { version = "=0.3.4", path = "amadeus-derive" }
amadeus-types = { version = "=0.3.4", path = "amadeus-types" }
amadeus-aws = { version = "=0.3.4", path = "amadeus-aws", optional = true }
amadeus-commoncrawl = { version = "=0.3.4", path = "amadeus-commoncrawl", optional = true }
amadeus-parquet = { version = "=0.3.4", path = "amadeus-parquet", optional = true }
amadeus-postgres = { version = "=0.3.4", path = "amadeus-postgres", optional = true }
amadeus-serde = { version = "=0.3.4", path = "amadeus-serde", optional = true }
async-channel = "1.1"
constellation-rs = { version = "0.2.0-alpha.2", default-features = false, optional = true }
derive-new = "0.5"
Expand Down
8 changes: 4 additions & 4 deletions amadeus-aws/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "amadeus-aws"
version = "0.3.3"
version = "0.3.4"
license = "Apache-2.0"
authors = ["Alec Mocatta <alec@mocatta.net>"]
categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"]
Expand All @@ -19,8 +19,8 @@ azure-devops = { project = "alecmocatta/amadeus", pipeline = "tests", build = "2
maintenance = { status = "actively-developed" }

[dependencies]
amadeus-core = { version = "=0.3.3", path = "../amadeus-core" }
amadeus-types = { version = "=0.3.3", path = "../amadeus-types" }
amadeus-core = { version = "=0.3.4", path = "../amadeus-core" }
amadeus-types = { version = "=0.3.4", path = "../amadeus-types" }
async-compression = { version = "0.3.3", features = ["gzip", "futures-bufread"] }
async-trait = "0.1"
chrono = { version = "0.4", default-features = false }
Expand All @@ -35,7 +35,7 @@ serde_closure = "0.3"
serde = { version = "1.0", features = ["derive"] }
tokio = "0.2"
url = { version = "2.1", features = ["serde"] }
vec-utils = "0.2"
recycle = "0.1"

# dependency of rusoto_core/hyper-tls/native-tls; ensure it's vendored to simplify cross-compilation
[target.'cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion amadeus-aws/src/cloudfront.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ use async_compression::futures::bufread::GzipDecoder;
use chrono::{NaiveDate, NaiveDateTime, NaiveTime, TimeZone, Utc};
use futures::{future, io::BufReader, AsyncBufReadExt, FutureExt, Stream, StreamExt, TryStreamExt};
use http::{Method, StatusCode};
use recycle::VecExt;
use rusoto_s3::{GetObjectRequest, Object, S3Client, S3};
use serde::{Deserialize, Serialize};
use serde_closure::FnMutNamed;
use std::{
convert::identity, io::{self}, time::Duration
};
use vec_utils::VecExt;

use amadeus_core::{
into_par_stream::IntoDistributedStream, par_stream::DistributedStream, util::{DistParStream, ResultExpandIter}, Source
Expand Down
2 changes: 1 addition & 1 deletion amadeus-aws/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//!
//! This is a support crate of [Amadeus](https://github.com/constellation-rs/amadeus) and is not intended to be used directly. These types are re-exposed in [`amadeus::source`](https://docs.rs/amadeus/0.3/amadeus/source/index.html).

#![doc(html_root_url = "https://docs.rs/amadeus-aws/0.3.3")]
#![doc(html_root_url = "https://docs.rs/amadeus-aws/0.3.4")]
#![cfg_attr(nightly, feature(type_alias_impl_trait))]
#![warn(
// missing_copy_implementations,
Expand Down
6 changes: 3 additions & 3 deletions amadeus-commoncrawl/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "amadeus-commoncrawl"
version = "0.3.3"
version = "0.3.4"
license = "MIT OR Apache-2.0"
authors = ["Stephen Becker IV <github@deathbyescalator.com>", "Alec Mocatta <alec@mocatta.net>"]
categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"]
Expand All @@ -19,8 +19,8 @@ azure-devops = { project = "alecmocatta/amadeus", pipeline = "tests", build = "2
maintenance = { status = "actively-developed" }

[dependencies]
amadeus-core = { version = "=0.3.3", path = "../amadeus-core" }
amadeus-types = { version = "=0.3.3", path = "../amadeus-types" }
amadeus-core = { version = "=0.3.4", path = "../amadeus-core" }
amadeus-types = { version = "=0.3.4", path = "../amadeus-types" }
async-compression = { version = "0.3.3", features = ["gzip", "futures-bufread"] }
futures = "0.3"
nom = "4.2.3"
Expand Down
2 changes: 1 addition & 1 deletion amadeus-commoncrawl/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//!
//! This is a support crate of [Amadeus](https://github.com/constellation-rs/amadeus) and is not intended to be used directly. These types are re-exposed in [`amadeus::source`](https://docs.rs/amadeus/0.3/amadeus/source/index.html).

#![doc(html_root_url = "https://docs.rs/amadeus-commoncrawl/0.3.3")]
#![doc(html_root_url = "https://docs.rs/amadeus-commoncrawl/0.3.4")]
#![cfg_attr(nightly, feature(type_alias_impl_trait))]
#![warn(
// missing_copy_implementations,
Expand Down
2 changes: 1 addition & 1 deletion amadeus-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "amadeus-core"
version = "0.3.3"
version = "0.3.4"
license = "Apache-2.0"
authors = ["Alec Mocatta <alec@mocatta.net>"]
categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"]
Expand Down
2 changes: 1 addition & 1 deletion amadeus-core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//!
//! This is a support crate of [Amadeus](https://github.com/constellation-rs/amadeus) and is not intended to be used directly. All functionality is re-exposed in [`amadeus`](https://docs.rs/amadeus/0.3/amadeus/).

#![doc(html_root_url = "https://docs.rs/amadeus-core/0.3.3")]
#![doc(html_root_url = "https://docs.rs/amadeus-core/0.3.4")]
#![cfg_attr(nightly, feature(unboxed_closures))]
#![recursion_limit = "25600"]
#![warn(
Expand Down
12 changes: 6 additions & 6 deletions amadeus-core/src/par_stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ macro_rules! stream {
}

stream!(ParallelStream ParallelPipe ParallelSink FromParallelStream IntoParallelStream into_par_stream ParStream ThreadPool Send ops assert_parallel_stream {
async fn reduce<P, B, R1, R3>(mut self, pool: &P, reduce_a_factory: R1, reduce_c: R3) -> B
async fn reduce<P, B, R1, R3>(mut self, pool: &P, reduce_a: R1, reduce_c: R3) -> B
where
P: ThreadPool,
R1: ReducerSend<Self::Item> + Clone + Send + 'static,
Expand Down Expand Up @@ -388,7 +388,7 @@ stream!(ParallelStream ParallelPipe ParallelSink FromParallelStream IntoParallel
.into_iter()
.filter(|tasks| !tasks.is_empty())
.map(|tasks| {
let reduce_a = reduce_a_factory.clone();
let reduce_a = reduce_a.clone();
pool.spawn(move || async move {
let sink = reduce_a.into_async();
pin_mut!(sink);
Expand Down Expand Up @@ -484,7 +484,7 @@ stream!(ParallelStream ParallelPipe ParallelSink FromParallelStream IntoParallel

stream!(DistributedStream DistributedPipe DistributedSink FromDistributedStream IntoDistributedStream into_dist_stream DistStream ProcessPool ProcessSend traits assert_distributed_stream cfg_attr(not(nightly), serde_closure::desugar) {
async fn reduce<P, B, R1, R2, R3>(
mut self, pool: &P, reduce_a_factory: R1, reduce_b_factory: R2, reduce_c: R3,
mut self, pool: &P, reduce_a: R1, reduce_b: R2, reduce_c: R3,
) -> B
where
P: ProcessPool,
Expand Down Expand Up @@ -546,8 +546,8 @@ stream!(DistributedStream DistributedPipe DistributedSink FromDistributedStream
.into_iter()
.filter(|tasks| !tasks.is_empty())
.map(|tasks| {
let reduce_b = reduce_b_factory.clone();
let reduce_a_factory = reduce_a_factory.clone();
let reduce_b = reduce_b.clone();
let reduce_a = reduce_a.clone();
pool.spawn(FnOnce!(move |pool: &P::ThreadPool| {
let mut process_tasks = tasks.into_iter();

Expand Down Expand Up @@ -595,7 +595,7 @@ stream!(DistributedStream DistributedPipe DistributedSink FromDistributedStream
.into_iter()
.filter(|tasks| !tasks.is_empty())
.map(|tasks| {
let reduce_a = reduce_a_factory.clone();
let reduce_a = reduce_a.clone();
pool.spawn(move || async move {
let sink = reduce_a.into_async();
pin_mut!(sink);
Expand Down
2 changes: 1 addition & 1 deletion amadeus-derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "amadeus-derive"
version = "0.3.3"
version = "0.3.4"
license = "Apache-2.0"
authors = ["Alec Mocatta <alec@mocatta.net>"]
categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"]
Expand Down
2 changes: 1 addition & 1 deletion amadeus-derive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//!
//! This is a support crate of [Amadeus](https://github.com/constellation-rs/amadeus) and is not intended to be used directly. This macro is re-exposed as [`amadeus::data::Data`](https://docs.rs/amadeus/0.3/amadeus/data/derive.Data.html).

#![doc(html_root_url = "https://docs.rs/amadeus-derive/0.3.3")]
#![doc(html_root_url = "https://docs.rs/amadeus-derive/0.3.4")]
#![recursion_limit = "400"]
#![warn(
missing_copy_implementations,
Expand Down
6 changes: 3 additions & 3 deletions amadeus-parquet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "amadeus-parquet"
version = "0.3.3"
version = "0.3.4"
license = "Apache-2.0"
authors = ["Alec Mocatta <alec@mocatta.net>", "Apache Arrow <dev@arrow.apache.org>"]
categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"]
Expand All @@ -19,8 +19,8 @@ azure-devops = { project = "alecmocatta/amadeus", pipeline = "tests", build = "2
maintenance = { status = "actively-developed" }

[dependencies]
amadeus-core = { version = "=0.3.3", path = "../amadeus-core" }
amadeus-types = { version = "=0.3.3", path = "../amadeus-types" }
amadeus-core = { version = "=0.3.4", path = "../amadeus-core" }
amadeus-types = { version = "=0.3.4", path = "../amadeus-types" }
async-trait = "0.1"
brotli = "3.3"
byteorder = "1.2"
Expand Down
2 changes: 1 addition & 1 deletion amadeus-parquet/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//!
//! This is a support crate of [Amadeus](https://github.com/constellation-rs/amadeus) and is not intended to be used directly. These types are re-exposed in [`amadeus::source`](https://docs.rs/amadeus/0.3/amadeus/source/index.html).

#![doc(html_root_url = "https://docs.rs/amadeus-parquet/0.3.3")]
#![doc(html_root_url = "https://docs.rs/amadeus-parquet/0.3.4")]
#![cfg_attr(nightly, feature(bufreader_seek_relative))]
#![cfg_attr(nightly, feature(read_initializer))]
#![cfg_attr(nightly, feature(specialization))]
Expand Down
6 changes: 3 additions & 3 deletions amadeus-postgres/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "amadeus-postgres"
version = "0.3.3"
version = "0.3.4"
license = "Apache-2.0"
authors = ["Alec Mocatta <alec@mocatta.net>"]
categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"]
Expand All @@ -19,8 +19,8 @@ azure-devops = { project = "alecmocatta/amadeus", pipeline = "tests", build = "2
maintenance = { status = "actively-developed" }

[dependencies]
amadeus-core = { version = "=0.3.3", path = "../amadeus-core" }
amadeus-types = { version = "=0.3.3", path = "../amadeus-types" }
amadeus-core = { version = "=0.3.4", path = "../amadeus-core" }
amadeus-types = { version = "=0.3.4", path = "../amadeus-types" }
bytes = "0.5"
chrono = { version = "0.4", default-features = false }
educe = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion amadeus-postgres/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//!
//! This is a support crate of [Amadeus](https://github.com/constellation-rs/amadeus) and is not intended to be used directly. These types are re-exposed in [`amadeus::source`](https://docs.rs/amadeus/0.3/amadeus/source/index.html).

#![doc(html_root_url = "https://docs.rs/amadeus-postgres/0.3.3")]
#![doc(html_root_url = "https://docs.rs/amadeus-postgres/0.3.4")]
#![cfg_attr(nightly, feature(type_alias_impl_trait))]
#![warn(
// missing_copy_implementations,
Expand Down
8 changes: 4 additions & 4 deletions amadeus-serde/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "amadeus-serde"
version = "0.3.3"
version = "0.3.4"
license = "Apache-2.0"
authors = ["Alec Mocatta <alec@mocatta.net>"]
categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"]
Expand All @@ -19,8 +19,8 @@ azure-devops = { project = "alecmocatta/amadeus", pipeline = "tests", build = "2
maintenance = { status = "actively-developed" }

[dependencies]
amadeus-core = { version = "=0.3.3", path = "../amadeus-core" }
amadeus-types = { version = "=0.3.3", path = "../amadeus-types" }
amadeus-core = { version = "=0.3.4", path = "../amadeus-core" }
amadeus-types = { version = "=0.3.4", path = "../amadeus-types" }
chrono = { version = "0.4", default-features = false, features = ["serde"] }
csv = "1.0"
educe = "0.4"
Expand All @@ -31,7 +31,7 @@ serde_bytes = "0.11"
serde_closure = "0.3"
serde_json = "1.0"
sum = { version = "0.1", features = ["serde"] }
vec-utils = "0.2"
recycle = "0.1"

[build-dependencies]
rustversion = "1.0"
2 changes: 1 addition & 1 deletion amadeus-serde/src/impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#![allow(clippy::too_many_lines)]

use linked_hash_map::LinkedHashMap;
use recycle::VecExt;
use serde::{
de::{self, MapAccess, SeqAccess, Visitor}, ser::{SerializeSeq, SerializeStruct, SerializeTupleStruct}, Deserializer, Serializer
};
use std::{
collections::HashMap, fmt, hash::{BuildHasher, Hash}, str, sync::Arc
};
use vec_utils::VecExt;

use amadeus_core::util::{type_coerce, type_coerce_ref, type_eq};
use amadeus_types::{
Expand Down
2 changes: 1 addition & 1 deletion amadeus-serde/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//!
//! This is a support crate of [Amadeus](https://github.com/constellation-rs/amadeus) and is not intended to be used directly. These types are re-exposed in [`amadeus::source`](https://docs.rs/amadeus/0.3/amadeus/source/index.html).

#![doc(html_root_url = "https://docs.rs/amadeus-serde/0.3.3")]
#![doc(html_root_url = "https://docs.rs/amadeus-serde/0.3.4")]
#![cfg_attr(nightly, feature(type_alias_impl_trait))]
#![warn(
// missing_copy_implementations,
Expand Down
6 changes: 3 additions & 3 deletions amadeus-types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "amadeus-types"
version = "0.3.3"
version = "0.3.4"
license = "Apache-2.0"
authors = ["Alec Mocatta <alec@mocatta.net>"]
categories = ["concurrency", "science", "database", "date-and-time", "data-structures"]
Expand All @@ -19,7 +19,7 @@ azure-devops = { project = "alecmocatta/amadeus", pipeline = "tests", build = "2
maintenance = { status = "actively-developed" }

[dependencies]
amadeus-core = { version = "=0.3.3", path = "../amadeus-core" }
amadeus-core = { version = "=0.3.4", path = "../amadeus-core" }
chrono = { version = "0.4", default-features = false, features = ["std", "serde"] }
chrono-tz = { version = "0.5", features = ["serde"] }
fxhash = "0.2"
Expand All @@ -28,7 +28,7 @@ once_cell = "1.0"
ordered-float = "2.0"
serde = { version = "1.0", features = ["derive"] }
url = { version = "2.1", features = ["serde"] }
vec-utils = "0.2"
recycle = "0.1"

[build-dependencies]
rustversion = "1.0"
2 changes: 1 addition & 1 deletion amadeus-types/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//!
//! This is a support crate of [Amadeus](https://github.com/constellation-rs/amadeus) and is not intended to be used directly. These types are re-exposed in [`amadeus::data`](https://docs.rs/amadeus/0.3/amadeus/data/index.html).

#![doc(html_root_url = "https://docs.rs/amadeus-types/0.3.3")]
#![doc(html_root_url = "https://docs.rs/amadeus-types/0.3.4")]
#![warn(
// missing_copy_implementations,
// missing_debug_implementations,
Expand Down
2 changes: 1 addition & 1 deletion amadeus-types/src/value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

use fxhash::FxBuildHasher;
use linked_hash_map::LinkedHashMap;
use recycle::VecExt;
use serde::{de::Deserializer, ser::Serializer, Deserialize, Serialize};
use std::{
cmp::Ordering, collections::HashMap, convert::TryInto, fmt, fmt::Debug, hash::{BuildHasher, Hash, Hasher}, iter::FromIterator, sync::Arc
};
use vec_utils::VecExt;

use crate::list::ListVec;

Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//! <a href="https://crates.io/crates/amadeus">📦&nbsp;&nbsp;Crates.io</a>&nbsp;&nbsp;│&nbsp;&nbsp;<a href="https://github.com/constellation-rs/amadeus">📑&nbsp;&nbsp;GitHub</a>&nbsp;&nbsp;│&nbsp;&nbsp;<a href="https://constellation.zulipchat.com/#narrow/stream/213231-amadeus">💬&nbsp;&nbsp;Chat</a>
//! </strong></p>

#![doc(html_root_url = "https://docs.rs/amadeus/0.3.3")]
#![doc(html_root_url = "https://docs.rs/amadeus/0.3.4")]
#![doc(
html_logo_url = "https://raw.githubusercontent.com/constellation-rs/amadeus/master/logo.svg?sanitize=true"
)]
Expand Down