From cbdaec0d04cf766e5d761b985bc3e5a2bd107147 Mon Sep 17 00:00:00 2001
From: alecmocatta <alec@mocatta.net>
Date: Sat, 13 Mar 2021 11:17:40 +0000
Subject: [PATCH] clippy clean

---
 amadeus-postgres/src/lib.rs | 4 ++--
 amadeus-serde/src/csv.rs    | 4 ++--
 amadeus-serde/src/json.rs   | 4 ++--
 amadeus-types/src/time.rs   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/amadeus-postgres/src/lib.rs b/amadeus-postgres/src/lib.rs
index d12f03cb..f0a3b867 100644
--- a/amadeus-postgres/src/lib.rs
+++ b/amadeus-postgres/src/lib.rs
@@ -213,9 +213,9 @@ where
 }
 
 #[cfg(not(nightly))]
-type Output<Row> = Pin<Box<dyn Stream<Item = Result<Row, PostgresError>> + Send>>;
+type Output<Row: PostgresData> = Pin<Box<dyn Stream<Item = Result<Row, PostgresError>> + Send>>;
 #[cfg(nightly)]
-type Output<Row> = impl Stream<Item = Result<Row, PostgresError>> + Send;
+type Output<Row: PostgresData> = impl Stream<Item = Result<Row, PostgresError>> + Send;
 
 FnMutNamed! {
 	pub type Closure<Row> = |self|(config, tables)=> (ConnectParams, Vec<PostgresSelect>)| -> Output<Row>
diff --git a/amadeus-serde/src/csv.rs b/amadeus-serde/src/csv.rs
index 34df5283..b2642302 100644
--- a/amadeus-serde/src/csv.rs
+++ b/amadeus-serde/src/csv.rs
@@ -79,9 +79,9 @@ where
 
 type Error<P, E> = CsvError<E, <P as Partition>::Error, <<P as Partition>::Page as Page>::Error>;
 #[cfg(not(nightly))]
-type Output<P, Row, E> = std::pin::Pin<Box<dyn Stream<Item = Result<Row, Error<P, E>>>>>;
+type Output<P, Row: SerdeData, E> = std::pin::Pin<Box<dyn Stream<Item = Result<Row, Error<P, E>>>>>;
 #[cfg(nightly)]
-type Output<P: Partition, Row, E> = impl Stream<Item = Result<Row, Error<P, E>>>;
+type Output<P: Partition, Row: SerdeData, E> = impl Stream<Item = Result<Row, Error<P, E>>>;
 
 FnMutNamed! {
 	pub type Closure<P, Row, E> = |self|partition=> P| -> Output<P, Row, E>
diff --git a/amadeus-serde/src/json.rs b/amadeus-serde/src/json.rs
index 9b72eae1..7954772d 100644
--- a/amadeus-serde/src/json.rs
+++ b/amadeus-serde/src/json.rs
@@ -38,9 +38,9 @@ where
 
 type Error<P, E> = JsonError<E, <P as Partition>::Error, <<P as Partition>::Page as Page>::Error>;
 #[cfg(not(nightly))]
-type Output<P, Row, E> = std::pin::Pin<Box<dyn Stream<Item = Result<Row, Error<P, E>>>>>;
+type Output<P, Row: SerdeData, E> = std::pin::Pin<Box<dyn Stream<Item = Result<Row, Error<P, E>>>>>;
 #[cfg(nightly)]
-type Output<P: Partition, Row, E> = impl Stream<Item = Result<Row, Error<P, E>>>;
+type Output<P: Partition, Row: SerdeData, E> = impl Stream<Item = Result<Row, Error<P, E>>>;
 
 FnMutNamed! {
 	pub type Closure<P, Row, E> = |self|partition=> P| -> Output<P, Row, E>
diff --git a/amadeus-types/src/time.rs b/amadeus-types/src/time.rs
index b3411f4b..1571e977 100644
--- a/amadeus-types/src/time.rs
+++ b/amadeus-types/src/time.rs
@@ -199,7 +199,7 @@ impl Timezone {
 				_ => None,
 			},
 		}
-		.map(|tz| tz.name())
+		.map(Tz::name)
 	}
 	/// Makes a new Timezone for the Eastern Hemisphere with given timezone difference. The negative seconds means the Western Hemisphere.
 	pub fn from_offset(seconds: i32) -> Option<Self> {