Skip to content

Commit 31cd9fc

Browse files
committed
update rust nightly to 2022-04-17
1 parent 8ddf5d5 commit 31cd9fc

File tree

7 files changed

+16
-15
lines changed

7 files changed

+16
-15
lines changed

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Install Rust
2727
uses: actions-rs/toolchain@v1
2828
with:
29-
toolchain: nightly-2021-11-18
29+
toolchain: nightly-2022-04-17
3030
components: rustfmt
3131
default: true
3232

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
- name: Install Rust
7070
uses: actions-rs/toolchain@v1
7171
with:
72-
toolchain: nightly-2021-11-18
72+
toolchain: nightly-2022-04-17
7373
components: rustfmt
7474
default: true
7575

@@ -194,7 +194,7 @@ jobs:
194194
- name: Install Rust
195195
uses: actions-rs/toolchain@v1
196196
with:
197-
toolchain: nightly-2021-11-18
197+
toolchain: nightly-2022-04-17
198198
components: rustfmt
199199
default: true
200200

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Install Rust
1515
uses: actions-rs/toolchain@v1
1616
with:
17-
toolchain: nightly-2021-11-18
17+
toolchain: nightly-2022-04-17
1818
components: rustfmt
1919
default: true
2020

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
2727
- uses: actions-rs/toolchain@v1
2828
with:
29-
toolchain: nightly-2021-11-18
29+
toolchain: nightly-2022-04-17
3030
components: rustfmt
3131
target: aarch64-unknown-linux-gnu
3232
default: true
@@ -88,7 +88,7 @@ jobs:
8888

8989
- uses: actions-rs/toolchain@v1
9090
with:
91-
toolchain: nightly-2021-11-18
91+
toolchain: nightly-2022-04-17
9292
components: rustfmt
9393
default: true
9494

@@ -135,7 +135,7 @@ jobs:
135135

136136
- uses: actions-rs/toolchain@v1
137137
with:
138-
toolchain: nightly-2021-11-18
138+
toolchain: nightly-2022-04-17
139139
components: rustfmt
140140
target: aarch64-apple-darwin
141141
default: true

connectorx-python/src/pandas/destination.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,7 @@ impl<'a> PandasDestination<'a> {
123123
impl<'a> Destination for PandasDestination<'a> {
124124
const DATA_ORDERS: &'static [DataOrder] = &[DataOrder::RowMajor];
125125
type TypeSystem = PandasTypeSystem;
126-
type Partition<'b>
127-
where
128-
'a: 'b,
129-
= PandasPartitionDestination<'b>;
126+
type Partition<'b> = PandasPartitionDestination<'b> where 'a: 'b;
130127
type Error = ConnectorXPythonError;
131128

132129
fn needs_count(&self) -> bool {

connectorx/src/macros.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ macro_rules! impl_transport {
201201
ts2: Self::TSD,
202202
src: &'r mut <<Self::S as $crate::sources::Source>::Partition as $crate::sources::SourcePartition>::Parser<'s>,
203203
dst: &'r mut <Self::D as $crate::destinations::Destination>::Partition<'d>,
204-
) -> Result<(), Self::Error> {
204+
) -> Result<(), Self::Error> where Self: 'd {
205205
match (ts1, ts2) {
206206
$(
207207
($TSS::$V1(true), $TSD::$V2(true)) => {
@@ -236,7 +236,7 @@ macro_rules! impl_transport {
236236
src: &mut <<Self::S as $crate::sources::Source>::Partition as $crate::sources::SourcePartition>::Parser<'s>,
237237
dst: &mut <Self::D as $crate::destinations::Destination>::Partition<'d>,
238238
) -> Result<(), Self::Error>
239-
> {
239+
> where Self: 'd {
240240
match (ts1, ts2) {
241241
$(
242242
($TSS::$V1(true), $TSD::$V2(true)) => {

connectorx/src/typesystem.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ pub trait Transport {
9393
ts2: Self::TSD,
9494
src: &'r mut <<Self::S as Source>::Partition as SourcePartition>::Parser<'s>,
9595
dst: &'r mut <Self::D as Destination>::Partition<'d>,
96-
) -> Result<(), Self::Error>;
96+
) -> Result<(), Self::Error>
97+
where
98+
Self: 'd;
9799

98100
#[allow(clippy::type_complexity)]
99101
fn processor<'s, 'd>(
@@ -104,7 +106,9 @@ pub trait Transport {
104106
src: &mut <<Self::S as Source>::Partition as SourcePartition>::Parser<'s>,
105107
dst: &mut <Self::D as Destination>::Partition<'d>,
106108
) -> Result<(), Self::Error>,
107-
>;
109+
>
110+
where
111+
Self: 'd;
108112
}
109113

110114
#[doc(hidden)]

0 commit comments

Comments
 (0)