fix docs

constellation-rs · Jul 15, 2020 · f2df2f0 · f2df2f0
1 parent 0e73efe
commit f2df2f0
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/amadeus-aws/src/cloudfront.rs b/amadeus-aws/src/cloudfront.rs
@@ -53,9 +53,9 @@ impl Cloudfront {
 	}
 }
 
-#[cfg(not(nightly))]
+#[cfg(not(all(nightly, not(doc))))]
 type Output = std::pin::Pin<Box<dyn Stream<Item = Result<CloudfrontRow, AwsError>> + Send>>;
-#[cfg(nightly)]
+#[cfg(all(nightly, not(doc)))]
 type Output = impl Stream<Item = Result<CloudfrontRow, AwsError>> + Send;
 
 FnMutNamed! {
@@ -103,7 +103,7 @@ FnMutNamed! {
 		}
 		.flatten_stream()
 		.map(|x: Result<Result<CloudfrontRow, _>, _>| x.and_then(identity));
-		#[cfg(not(nightly))]
+		#[cfg(not(all(nightly, not(doc))))]
 		let ret = ret.boxed();
 		ret
 	}
@@ -114,13 +114,13 @@ impl Source for Cloudfront {
 	type Error = AwsError;
 
 	type ParStream = DistParStream<Self::DistStream>;
-	#[cfg(not(nightly))]
+	#[cfg(not(all(nightly, not(doc))))]
 	#[allow(clippy::type_complexity)]
 	type DistStream = amadeus_core::par_stream::FlatMap<
 		amadeus_core::into_par_stream::IterDistStream<std::vec::IntoIter<String>>,
 		Closure,
 	>;
-	#[cfg(nightly)]
+	#[cfg(all(nightly, not(doc)))]
 	type DistStream = impl DistributedStream<Item = Result<Self::Item, Self::Error>>;
 
 	fn par_stream(self) -> Self::ParStream {

diff --git a/amadeus-commoncrawl/src/lib.rs b/amadeus-commoncrawl/src/lib.rs
@@ -80,9 +80,9 @@ impl CommonCrawl {
 	}
 }
 
-#[cfg(not(nightly))]
+#[cfg(not(all(nightly, not(doc))))]
 type Output = std::pin::Pin<Box<dyn Stream<Item = Result<Webpage<'static>, io::Error>> + Send>>;
-#[cfg(nightly)]
+#[cfg(all(nightly, not(doc)))]
 type Output = impl Stream<Item = Result<Webpage<'static>, io::Error>> + Send;
 
 FnMutNamed! {
@@ -99,7 +99,7 @@ FnMutNamed! {
 				WarcParser::new(body)
 			}
 			.flatten_stream();
-		#[cfg(not(nightly))]
+		#[cfg(not(all(nightly, not(doc))))]
 		let ret = ret.boxed();
 		ret
 	}
@@ -110,13 +110,13 @@ impl Source for CommonCrawl {
 	type Error = io::Error;
 
 	type ParStream = DistParStream<Self::DistStream>;
-	#[cfg(not(nightly))]
+	#[cfg(not(all(nightly, not(doc))))]
 	#[allow(clippy::type_complexity)]
 	type DistStream = amadeus_core::par_stream::FlatMap<
 		amadeus_core::into_par_stream::IterDistStream<std::vec::IntoIter<String>>,
 		Closure,
 	>;
-	#[cfg(nightly)]
+	#[cfg(all(nightly, not(doc)))]
 	type DistStream = impl DistributedStream<Item = Result<Self::Item, Self::Error>>;
 
 	fn par_stream(self) -> Self::ParStream {

diff --git a/amadeus-parquet/src/lib.rs b/amadeus-parquet/src/lib.rs
@@ -38,10 +38,10 @@
 #[cfg(nightly)]
 extern crate test;
 
-#[cfg(nightly)]
+#[cfg(all(nightly, not(doc)))]
 mod internal;
 
-#[cfg(nightly)]
+#[cfg(all(nightly, not(doc)))]
 mod wrap {
 	use super::internal;
 	use async_trait::async_trait;
@@ -371,5 +371,5 @@ mod wrap {
 		}
 	}
 }
-#[cfg(nightly)]
+#[cfg(all(nightly, not(doc)))]
 pub use wrap::*;
diff --git a/amadeus-postgres/src/lib.rs b/amadeus-postgres/src/lib.rs
@@ -212,9 +212,9 @@ where
 	}
 }
 
-#[cfg(not(nightly))]
+#[cfg(not(all(nightly, not(doc))))]
 type Output<Row> = Pin<Box<dyn Stream<Item = Result<Row, PostgresError>> + Send>>;
-#[cfg(nightly)]
+#[cfg(all(nightly, not(doc)))]
 type Output<Row> = impl Stream<Item = Result<Row, PostgresError>> + Send;
 
 FnMutNamed! {
@@ -261,7 +261,7 @@ FnMutNamed! {
 			})
 		}
 		.flatten_stream();
-		#[cfg(not(nightly))]
+		#[cfg(not(all(nightly, not(doc))))]
 		let ret = ret.boxed();
 		ret
 	}
@@ -275,15 +275,15 @@ where
 	type Error = PostgresError;
 
 	type ParStream = DistParStream<Self::DistStream>;
-	#[cfg(not(nightly))]
+	#[cfg(not(all(nightly, not(doc))))]
 	#[allow(clippy::type_complexity)]
 	type DistStream = amadeus_core::par_stream::FlatMap<
 		amadeus_core::into_par_stream::IterDistStream<
 			std::vec::IntoIter<(ConnectParams, Vec<PostgresSelect>)>,
 		>,
 		Closure<Row>,
 	>;
-	#[cfg(nightly)]
+	#[cfg(all(nightly, not(doc)))]
 	type DistStream = impl DistributedStream<Item = Result<Self::Item, Self::Error>>;
 
 	fn par_stream(self) -> Self::ParStream {

diff --git a/amadeus-serde/src/csv.rs b/amadeus-serde/src/csv.rs
@@ -80,9 +80,9 @@ where
 }
 
 type Error<P, E> = CsvError<E, <P as Partition>::Error, <<P as Partition>::Page as Page>::Error>;
-#[cfg(not(nightly))]
+#[cfg(not(all(nightly, not(doc))))]
 type Output<P, Row, E> = std::pin::Pin<Box<dyn Stream<Item = Result<Row, Error<P, E>>>>>;
-#[cfg(nightly)]
+#[cfg(all(nightly, not(doc)))]
 type Output<P: Partition, Row, E> = impl Stream<Item = Result<Row, Error<P, E>>>;
 
 FnMutNamed! {
@@ -128,7 +128,7 @@ FnMutNamed! {
 			.map(ResultExpandIter::new)
 			.flatten_stream()
 			.map(|row: Result<Result<Row, Error<P, E>>, Error<P, E>>| Ok(row??));
-		#[cfg(not(nightly))]
+		#[cfg(not(all(nightly, not(doc))))]
 		let ret = ret.boxed_local();
 		ret
 	}
@@ -148,13 +148,13 @@ where
 	>;
 
 	type ParStream = DistParStream<Self::DistStream>;
-	#[cfg(not(nightly))]
+	#[cfg(not(all(nightly, not(doc))))]
 	#[allow(clippy::type_complexity)]
 	type DistStream = amadeus_core::par_stream::FlatMap<
 		amadeus_core::into_par_stream::IterDistStream<std::vec::IntoIter<F::Partition>>,
 		Closure<F::Partition, Row, F::Error>,
 	>;
-	#[cfg(nightly)]
+	#[cfg(all(nightly, not(doc)))]
 	type DistStream = impl DistributedStream<Item = Result<Self::Item, Self::Error>>;
 
 	fn par_stream(self) -> Self::ParStream {

diff --git a/amadeus-serde/src/json.rs b/amadeus-serde/src/json.rs
@@ -39,9 +39,9 @@ where
 }
 
 type Error<P, E> = JsonError<E, <P as Partition>::Error, <<P as Partition>::Page as Page>::Error>;
-#[cfg(not(nightly))]
+#[cfg(not(all(nightly, not(doc))))]
 type Output<P, Row, E> = std::pin::Pin<Box<dyn Stream<Item = Result<Row, Error<P, E>>>>>;
-#[cfg(nightly)]
+#[cfg(all(nightly, not(doc)))]
 type Output<P: Partition, Row, E> = impl Stream<Item = Result<Row, Error<P, E>>>;
 
 FnMutNamed! {
@@ -82,7 +82,7 @@ FnMutNamed! {
 			.map(ResultExpandIter::new)
 			.flatten_stream()
 			.map(|row: Result<Result<Row, Error<P, E>>, Error<P, E>>| Ok(row??));
-		#[cfg(not(nightly))]
+		#[cfg(not(all(nightly, not(doc))))]
 		let ret = ret.boxed_local();
 		ret
 	}
@@ -102,13 +102,13 @@ where
 	>;
 
 	type ParStream = DistParStream<Self::DistStream>;
-	#[cfg(not(nightly))]
+	#[cfg(not(all(nightly, not(doc))))]
 	#[allow(clippy::type_complexity)]
 	type DistStream = amadeus_core::par_stream::FlatMap<
 		amadeus_core::into_par_stream::IterDistStream<std::vec::IntoIter<F::Partition>>,
 		Closure<F::Partition, Row, F::Error>,
 	>;
-	#[cfg(nightly)]
+	#[cfg(all(nightly, not(doc)))]
 	type DistStream = impl DistributedStream<Item = Result<Self::Item, Self::Error>>;
 
 	fn par_stream(self) -> Self::ParStream {