Skip to content

Commit 6160152

Browse files
authored
Merge pull request #395 from sfu-db/stable_rust
use stable rust with GAT stablized in 1.65
2 parents 84319cc + e42266d commit 6160152

File tree

6 files changed

+18
-22
lines changed

6 files changed

+18
-22
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-2022-09-15
29+
toolchain: 1.65.0
3030
components: rustfmt
3131
default: true
3232

.github/workflows/ci.yml

Lines changed: 4 additions & 4 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-2022-09-15
72+
toolchain: 1.65.0
7373
components: rustfmt
7474
default: true
7575

@@ -191,14 +191,14 @@ jobs:
191191
- name: Install Rust
192192
uses: actions-rs/toolchain@v1
193193
with:
194-
toolchain: nightly-2022-09-15
194+
toolchain: 1.65.0
195195
components: rustfmt
196196
default: true
197197

198198
- uses: actions/setup-java@v3
199199
with:
200-
distribution: 'temurin'
201-
java-version: '8'
200+
distribution: "temurin"
201+
java-version: "8"
202202

203203
- uses: actions/cache@v2
204204
with:

.github/workflows/docs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
- name: Install Rust
1515
uses: actions-rs/toolchain@v1
1616
with:
17-
toolchain: nightly-2022-09-15
17+
toolchain: 1.65.0
1818
components: rustfmt
1919
default: true
2020

2121
- name: Intall Python
2222
uses: actions/setup-python@v1
2323
with:
2424
python-version: 3.7
25-
25+
2626
- name: Install dependencies
2727
run: |
2828
pip install -r docs/requirements.txt
@@ -39,10 +39,10 @@ jobs:
3939

4040
- name: Move the rust doc into jupyter book
4141
run: mv target/doc ./docs/_build/html/rust-docs
42-
42+
4343
- name: Add .nojekyll
4444
run: touch ./docs/_build/html/.nojekyll
45-
45+
4646
- name: Deploy Docs 🚀
4747
uses: JamesIves/[email protected]
4848
with:

.github/workflows/release.yml

Lines changed: 9 additions & 9 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-2022-09-15
29+
toolchain: 1.65.0
3030
components: rustfmt
3131
target: aarch64-unknown-linux-gnu
3232
default: true
@@ -47,7 +47,7 @@ jobs:
4747
4848
- uses: messense/maturin-action@v1
4949
with:
50-
rust-toolchain: nightly-2022-09-15
50+
rust-toolchain: 1.65.0
5151
maturin-version: v0.12.1
5252
command: build
5353
args: -m connectorx-python/Cargo.toml -i python --no-sdist --release --manylinux 2014
@@ -61,7 +61,7 @@ jobs:
6161
# rebuild the wheel to incorporate j4rs dependencies
6262
- uses: messense/maturin-action@v1
6363
with:
64-
rust-toolchain: nightly-2022-09-15
64+
rust-toolchain: 1.65.0
6565
maturin-version: v0.12.1
6666
command: build
6767
args: -m connectorx-python/Cargo.toml -i python --no-sdist --release --manylinux 2014
@@ -101,7 +101,7 @@ jobs:
101101

102102
- uses: actions-rs/toolchain@v1
103103
with:
104-
toolchain: nightly-2022-09-15
104+
toolchain: 1.65.0
105105
components: rustfmt
106106
default: true
107107

@@ -117,7 +117,7 @@ jobs:
117117
118118
- uses: messense/maturin-action@v1
119119
with:
120-
rust-toolchain: nightly-2022-09-15
120+
rust-toolchain: 1.65.0
121121
maturin-version: v0.12.1
122122
command: build
123123
args: -m connectorx-python/Cargo.toml -i python --no-sdist --release
@@ -131,7 +131,7 @@ jobs:
131131
# rebuild the wheel to incorporate j4rs dependencies
132132
- uses: messense/maturin-action@v1
133133
with:
134-
rust-toolchain: nightly-2022-09-15
134+
rust-toolchain: 1.65.0
135135
maturin-version: v0.12.1
136136
command: build
137137
args: -m connectorx-python/Cargo.toml -i python --no-sdist --release
@@ -161,7 +161,7 @@ jobs:
161161

162162
- uses: actions-rs/toolchain@v1
163163
with:
164-
toolchain: nightly-2022-09-15
164+
toolchain: 1.65.0
165165
components: rustfmt
166166
target: aarch64-apple-darwin
167167
default: true
@@ -178,7 +178,7 @@ jobs:
178178
179179
- uses: messense/maturin-action@v1
180180
with:
181-
rust-toolchain: nightly-2022-09-15
181+
rust-toolchain: 1.65.0
182182
maturin-version: v0.12.1
183183
command: build
184184
args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --no-sdist --release
@@ -192,7 +192,7 @@ jobs:
192192
# rebuild the wheel to incorporate j4rs dependencies
193193
- uses: messense/maturin-action@v1
194194
with:
195-
rust-toolchain: nightly-2022-09-15
195+
rust-toolchain: 1.65.0
196196
maturin-version: v0.12.1
197197
command: build
198198
args: -m connectorx-python/Cargo.toml --target aarch64-apple-darwin -i python --no-sdist --release

connectorx-python/src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
#![feature(fmt_internals)]
2-
#![allow(incomplete_features)]
3-
41
pub mod arrow;
52
pub mod arrow2;
63
pub mod constants;

connectorx/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![allow(incomplete_features)]
21
#![allow(clippy::upper_case_acronyms)]
32

43
//! # ConnectorX

0 commit comments

Comments
 (0)