fix CI

constellation-rs · Jul 14, 2020 · 9216f90 · 9216f90
1 parent e0da6b2
commit 9216f90
Show file tree

Hide file tree

Showing 25 changed files with 100 additions and 24 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,6 @@ homepage = "https://github.com/alecmocatta/amadeus"
 documentation = "https://docs.rs/amadeus"
 readme = "README.md"
 edition = "2018"
-build = "src/build.rs"
 
 [badges]
 azure-devops = { project = "alecmocatta/amadeus", pipeline = "tests", build = "26" }
@@ -45,7 +44,7 @@ amadeus-parquet = { version = "=0.3.1", path = "amadeus-parquet", optional = tru
 amadeus-postgres = { version = "=0.3.1", path = "amadeus-postgres", optional = true }
 amadeus-serde = { version = "=0.3.1", path = "amadeus-serde", optional = true }
 async-channel = "1.1"
-constellation-rs = { version = "0.1", default-features = false, optional = true }
+constellation-rs = { version = "0.2.0-alpha.2", default-features = false, optional = true }
 derive-new = "0.5"
 doc-comment = "0.3"
 futures = "0.3"
@@ -69,9 +68,7 @@ rustversion = "1.0"
 [patch.crates-io]
 vec-utils = { version = "*", git = "https://github.com/alecmocatta/vec-utils", branch = "stable" }
 streaming_algorithms = { version = "*", git = "https://github.com/alecmocatta/streaming_algorithms", branch = "stable" }
-serde_closure = { version = "*", git = "https://github.com/alecmocatta/serde_closure", branch = "nameable" }
-# serde_closure = { version = "*", path = "../serde_closure" }
-# serde_traitobject = { version = "*", path = "../serde_traitobject" }
+constellation-rs = { version = "0.2.0-alpha.2", git = "https://github.com/constellation-rs/constellation", branch = "dependabot/cargo/serde_closure-0.3" }
 
 [[example]]
 name = "cloudfront_logs"

diff --git a/amadeus-aws/Cargo.toml b/amadeus-aws/Cargo.toml
@@ -13,7 +13,6 @@ homepage = "https://github.com/alecmocatta/amadeus"
 documentation = "https://docs.rs/amadeus"
 readme = "README.md"
 edition = "2018"
-build = "src/build.rs"
 
 [badges]
 azure-devops = { project = "alecmocatta/amadeus", pipeline = "tests", build = "26" }

diff --git a/amadeus-aws/build.rs b/amadeus-aws/build.rs
@@ -0,0 +1,12 @@
+fn main() {
+	println!("cargo:rerun-if-changed=build.rs");
+
+	nightly();
+}
+
+#[rustversion::nightly]
+fn nightly() {
+	println!("cargo:rustc-cfg=nightly");
+}
+#[rustversion::not(nightly)]
+fn nightly() {}
diff --git a/amadeus-aws/src/build.rs b/amadeus-aws/src/build.rs
diff --git a/amadeus-commoncrawl/Cargo.toml b/amadeus-commoncrawl/Cargo.toml
@@ -13,7 +13,6 @@ homepage = "https://github.com/alecmocatta/amadeus"
 documentation = "https://docs.rs/amadeus"
 readme = "README.md"
 edition = "2018"
-build = "src/build.rs"
 
 [badges]
 azure-devops = { project = "alecmocatta/amadeus", pipeline = "tests", build = "26" }

diff --git a/amadeus-commoncrawl/build.rs b/amadeus-commoncrawl/build.rs
@@ -0,0 +1,12 @@
+fn main() {
+	println!("cargo:rerun-if-changed=build.rs");
+
+	nightly();
+}
+
+#[rustversion::nightly]
+fn nightly() {
+	println!("cargo:rustc-cfg=nightly");
+}
+#[rustversion::not(nightly)]
+fn nightly() {}
diff --git a/amadeus-commoncrawl/src/build.rs b/amadeus-commoncrawl/src/build.rs
diff --git a/amadeus-core/Cargo.toml b/amadeus-core/Cargo.toml
@@ -13,7 +13,6 @@ homepage = "https://github.com/alecmocatta/amadeus"
 documentation = "https://docs.rs/amadeus"
 readme = "README.md"
 edition = "2018"
-build = "src/build.rs"
 
 [badges]
 azure-devops = { project = "alecmocatta/amadeus", pipeline = "tests", build = "26" }

diff --git a/amadeus-core/build.rs b/amadeus-core/build.rs
@@ -0,0 +1,12 @@
+fn main() {
+	println!("cargo:rerun-if-changed=build.rs");
+
+	nightly();
+}
+
+#[rustversion::nightly]
+fn nightly() {
+	println!("cargo:rustc-cfg=nightly");
+}
+#[rustversion::not(nightly)]
+fn nightly() {}
diff --git a/amadeus-core/src/build.rs b/amadeus-core/src/build.rs
diff --git a/amadeus-parquet/Cargo.toml b/amadeus-parquet/Cargo.toml
@@ -13,7 +13,6 @@ homepage = "https://github.com/alecmocatta/amadeus"
 documentation = "https://docs.rs/amadeus"
 readme = "README.md"
 edition = "2018"
-build = "src/build.rs"
 
 [badges]
 azure-devops = { project = "alecmocatta/amadeus", pipeline = "tests", build = "26" }

diff --git a/amadeus-parquet/build.rs b/amadeus-parquet/build.rs
@@ -0,0 +1,12 @@
+fn main() {
+	println!("cargo:rerun-if-changed=build.rs");
+
+	nightly();
+}
+
+#[rustversion::nightly]
+fn nightly() {
+	println!("cargo:rustc-cfg=nightly");
+}
+#[rustversion::not(nightly)]
+fn nightly() {}
diff --git a/amadeus-parquet/src/build.rs b/amadeus-parquet/src/build.rs
diff --git a/amadeus-parquet/src/internal/record/impls.rs b/amadeus-parquet/src/internal/record/impls.rs
@@ -15,7 +15,7 @@ use crate::internal::{
 		BoolType, ByteArrayType, DoubleType, FixedLenByteArrayType, FloatType, Int32Type, Int64Type, Int96, Int96Type
 	}, errors::{ParquetError, Result}, record::{
 		display::{DisplayFmt, DisplaySchemaGroup}, predicates::{GroupPredicate, MapPredicate, ValuePredicate}, reader::{
-			BoolReader, BoxFixedLenByteArrayReader, BoxReader, ByteArrayReader, F32Reader, F64Reader, FixedLenByteArrayReader, GroupReader, I32Reader, I64Reader, I96Reader, KeyValueReader, MapReader, OptionReader, RepeatedReader, RootReader, TryIntoReader, TupleReader, ValueReader, VecU8Reader
+			BoolReader, BoxReader, ByteArrayReader, F32Reader, F64Reader, FixedLenByteArrayReader, GroupReader, I32Reader, I64Reader, I96Reader, KeyValueReader, MapReader, OptionReader, RepeatedReader, RootReader, TryIntoReader, TupleReader, ValueReader, VecU8Reader
 		}, schemas::{
 			BoolSchema, BoxSchema, BsonSchema, ByteArraySchema, DateSchema, DateTimeSchema, DecimalSchema, EnumSchema, F32Schema, F64Schema, FixedByteArraySchema, GroupSchema, I16Schema, I32Schema, I64Schema, I8Schema, JsonSchema, ListSchema, ListSchemaType, MapSchema, OptionSchema, RootSchema, StringSchema, TimeSchema, TupleSchema, U16Schema, U32Schema, U64Schema, U8Schema, ValueSchema, VecU8Schema
 		}, triplet::TypedTripletIter, types::{downcast, Downcast, Root}, ParquetData, Predicate, Reader, Schema

diff --git a/amadeus-postgres/Cargo.toml b/amadeus-postgres/Cargo.toml
@@ -13,7 +13,6 @@ homepage = "https://github.com/alecmocatta/amadeus"
 documentation = "https://docs.rs/amadeus"
 readme = "README.md"
 edition = "2018"
-build = "src/build.rs"
 
 [badges]
 azure-devops = { project = "alecmocatta/amadeus", pipeline = "tests", build = "26" }

diff --git a/amadeus-postgres/build.rs b/amadeus-postgres/build.rs
@@ -0,0 +1,12 @@
+fn main() {
+	println!("cargo:rerun-if-changed=build.rs");
+
+	nightly();
+}
+
+#[rustversion::nightly]
+fn nightly() {
+	println!("cargo:rustc-cfg=nightly");
+}
+#[rustversion::not(nightly)]
+fn nightly() {}
diff --git a/amadeus-postgres/src/build.rs b/amadeus-postgres/src/build.rs
diff --git a/amadeus-serde/Cargo.toml b/amadeus-serde/Cargo.toml
@@ -13,7 +13,6 @@ homepage = "https://github.com/alecmocatta/amadeus"
 documentation = "https://docs.rs/amadeus"
 readme = "README.md"
 edition = "2018"
-build = "src/build.rs"
 
 [badges]
 azure-devops = { project = "alecmocatta/amadeus", pipeline = "tests", build = "26" }

diff --git a/amadeus-serde/build.rs b/amadeus-serde/build.rs
@@ -0,0 +1,12 @@
+fn main() {
+	println!("cargo:rerun-if-changed=build.rs");
+
+	nightly();
+}
+
+#[rustversion::nightly]
+fn nightly() {
+	println!("cargo:rustc-cfg=nightly");
+}
+#[rustversion::not(nightly)]
+fn nightly() {}
diff --git a/amadeus-serde/src/build.rs b/amadeus-serde/src/build.rs
diff --git a/amadeus-types/Cargo.toml b/amadeus-types/Cargo.toml
@@ -13,7 +13,6 @@ homepage = "https://github.com/alecmocatta/amadeus"
 documentation = "https://docs.rs/amadeus"
 readme = "README.md"
 edition = "2018"
-build = "src/build.rs"
 
 [badges]
 azure-devops = { project = "alecmocatta/amadeus", pipeline = "tests", build = "26" }

diff --git a/amadeus-types/build.rs b/amadeus-types/build.rs
@@ -0,0 +1,12 @@
+fn main() {
+	println!("cargo:rerun-if-changed=build.rs");
+
+	nightly();
+}
+
+#[rustversion::nightly]
+fn nightly() {
+	println!("cargo:rustc-cfg=nightly");
+}
+#[rustversion::not(nightly)]
+fn nightly() {}
diff --git a/amadeus-types/src/build.rs b/amadeus-types/src/build.rs
diff --git a/build.rs b/build.rs
@@ -0,0 +1,12 @@
+fn main() {
+	println!("cargo:rerun-if-changed=build.rs");
+
+	nightly();
+}
+
+#[rustversion::nightly]
+fn nightly() {
+	println!("cargo:rustc-cfg=nightly");
+}
+#[rustversion::not(nightly)]
+fn nightly() {}
diff --git a/src/pool/process.rs b/src/pool/process.rs
@@ -12,11 +12,8 @@ use super::{
 	util::{assert_sync_and_send, OnDrop, Panicked, RoundRobin, Synchronize}, ThreadPool
 };
 
-trait FnOnce<Args>: traits::FnOnceBox<Args> + st::Serialize + st::Deserialize {}
-impl<T, Args> FnOnce<Args> for T where T: traits::FnOnce<Args> + st::Serialize + st::Deserialize {}
-
 #[serde_closure::desugar]
-type Request = st::Box<dyn FnOnce(&ThreadPool) -> LocalBoxFuture<'static, Response> + Send>;
+type Request = st::Box<dyn st::sc::FnOnce(&ThreadPool) -> LocalBoxFuture<'static, Response> + Send>;
 type Response = Box<dyn st::Any + Send>;
 
 mod future_ext {