diff --git a/Cargo.toml b/Cargo.toml index e5a9415e..a6faa833 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "amadeus" -version = "0.3.3" +version = "0.3.4" license = "Apache-2.0" authors = ["Alec Mocatta "] categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"] @@ -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" diff --git a/amadeus-aws/Cargo.toml b/amadeus-aws/Cargo.toml index 0fa2e0ad..0cbd3e4d 100644 --- a/amadeus-aws/Cargo.toml +++ b/amadeus-aws/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "amadeus-aws" -version = "0.3.3" +version = "0.3.4" license = "Apache-2.0" authors = ["Alec Mocatta "] categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"] @@ -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 } @@ -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] diff --git a/amadeus-aws/src/cloudfront.rs b/amadeus-aws/src/cloudfront.rs index 4b550144..63e91f30 100644 --- a/amadeus-aws/src/cloudfront.rs +++ b/amadeus-aws/src/cloudfront.rs @@ -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 diff --git a/amadeus-aws/src/lib.rs b/amadeus-aws/src/lib.rs index 5cefc93f..085fdd78 100644 --- a/amadeus-aws/src/lib.rs +++ b/amadeus-aws/src/lib.rs @@ -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, diff --git a/amadeus-commoncrawl/Cargo.toml b/amadeus-commoncrawl/Cargo.toml index 0af0dda5..7e1931ef 100644 --- a/amadeus-commoncrawl/Cargo.toml +++ b/amadeus-commoncrawl/Cargo.toml @@ -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 ", "Alec Mocatta "] categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"] @@ -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" diff --git a/amadeus-commoncrawl/src/lib.rs b/amadeus-commoncrawl/src/lib.rs index 2df20560..b270f583 100644 --- a/amadeus-commoncrawl/src/lib.rs +++ b/amadeus-commoncrawl/src/lib.rs @@ -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, diff --git a/amadeus-core/Cargo.toml b/amadeus-core/Cargo.toml index 3d8be29e..d44001c6 100644 --- a/amadeus-core/Cargo.toml +++ b/amadeus-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "amadeus-core" -version = "0.3.3" +version = "0.3.4" license = "Apache-2.0" authors = ["Alec Mocatta "] categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"] diff --git a/amadeus-core/src/lib.rs b/amadeus-core/src/lib.rs index 7aa3df08..4bb58eba 100644 --- a/amadeus-core/src/lib.rs +++ b/amadeus-core/src/lib.rs @@ -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( diff --git a/amadeus-core/src/par_stream.rs b/amadeus-core/src/par_stream.rs index da7ad6dc..54b4fc1c 100644 --- a/amadeus-core/src/par_stream.rs +++ b/amadeus-core/src/par_stream.rs @@ -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(mut self, pool: &P, reduce_a_factory: R1, reduce_c: R3) -> B + async fn reduce(mut self, pool: &P, reduce_a: R1, reduce_c: R3) -> B where P: ThreadPool, R1: ReducerSend + Clone + Send + 'static, @@ -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); @@ -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( - 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, @@ -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(); @@ -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); diff --git a/amadeus-derive/Cargo.toml b/amadeus-derive/Cargo.toml index 452ca621..1bda1a69 100644 --- a/amadeus-derive/Cargo.toml +++ b/amadeus-derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "amadeus-derive" -version = "0.3.3" +version = "0.3.4" license = "Apache-2.0" authors = ["Alec Mocatta "] categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"] diff --git a/amadeus-derive/src/lib.rs b/amadeus-derive/src/lib.rs index 9218de80..404f6777 100644 --- a/amadeus-derive/src/lib.rs +++ b/amadeus-derive/src/lib.rs @@ -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, diff --git a/amadeus-parquet/Cargo.toml b/amadeus-parquet/Cargo.toml index bdf1a4ef..b91d283b 100644 --- a/amadeus-parquet/Cargo.toml +++ b/amadeus-parquet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "amadeus-parquet" -version = "0.3.3" +version = "0.3.4" license = "Apache-2.0" authors = ["Alec Mocatta ", "Apache Arrow "] categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"] @@ -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" diff --git a/amadeus-parquet/src/lib.rs b/amadeus-parquet/src/lib.rs index 11a22634..61ce22eb 100644 --- a/amadeus-parquet/src/lib.rs +++ b/amadeus-parquet/src/lib.rs @@ -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))] diff --git a/amadeus-postgres/Cargo.toml b/amadeus-postgres/Cargo.toml index 490185d6..37d6fddc 100644 --- a/amadeus-postgres/Cargo.toml +++ b/amadeus-postgres/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "amadeus-postgres" -version = "0.3.3" +version = "0.3.4" license = "Apache-2.0" authors = ["Alec Mocatta "] categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"] @@ -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" diff --git a/amadeus-postgres/src/lib.rs b/amadeus-postgres/src/lib.rs index 03552abf..74e90e45 100644 --- a/amadeus-postgres/src/lib.rs +++ b/amadeus-postgres/src/lib.rs @@ -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, diff --git a/amadeus-serde/Cargo.toml b/amadeus-serde/Cargo.toml index f76c2dca..ce02a0c6 100644 --- a/amadeus-serde/Cargo.toml +++ b/amadeus-serde/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "amadeus-serde" -version = "0.3.3" +version = "0.3.4" license = "Apache-2.0" authors = ["Alec Mocatta "] categories = ["concurrency", "science", "database", "parser-implementations", "text-processing"] @@ -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" @@ -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" diff --git a/amadeus-serde/src/impls.rs b/amadeus-serde/src/impls.rs index e2a514b2..f62d6192 100644 --- a/amadeus-serde/src/impls.rs +++ b/amadeus-serde/src/impls.rs @@ -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::{ diff --git a/amadeus-serde/src/lib.rs b/amadeus-serde/src/lib.rs index 1d68afe4..e5c7c9cd 100644 --- a/amadeus-serde/src/lib.rs +++ b/amadeus-serde/src/lib.rs @@ -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, diff --git a/amadeus-types/Cargo.toml b/amadeus-types/Cargo.toml index deb71a9b..a3f8c3ac 100644 --- a/amadeus-types/Cargo.toml +++ b/amadeus-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "amadeus-types" -version = "0.3.3" +version = "0.3.4" license = "Apache-2.0" authors = ["Alec Mocatta "] categories = ["concurrency", "science", "database", "date-and-time", "data-structures"] @@ -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" @@ -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" diff --git a/amadeus-types/src/lib.rs b/amadeus-types/src/lib.rs index e660b10c..c7b2f365 100644 --- a/amadeus-types/src/lib.rs +++ b/amadeus-types/src/lib.rs @@ -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, diff --git a/amadeus-types/src/value.rs b/amadeus-types/src/value.rs index d5912d52..22be2761 100644 --- a/amadeus-types/src/value.rs +++ b/amadeus-types/src/value.rs @@ -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; diff --git a/src/lib.rs b/src/lib.rs index 7bec4cd2..38d867b7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,7 +4,7 @@ //! 📦  Crates.io  â”‚  ðŸ“‘  GitHub  â”‚  ðŸ’¬  Chat //!

-#![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" )]