Skip to content

Commit

Permalink
clippy clean
Browse files Browse the repository at this point in the history
  • Loading branch information
alecmocatta committed Mar 13, 2021
1 parent 497d010 commit cbdaec0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions amadeus-postgres/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions amadeus-serde/src/csv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions amadeus-serde/src/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion amadeus-types/src/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down

0 comments on commit cbdaec0

Please sign in to comment.