Skip to content

Commit cfc95b5

Browse files
ovrovr
authored
feat: Upgrade rust to 1.84.1 (stable) (#9222)
1 parent b3777c3 commit cfc95b5

File tree

33 files changed

+159
-271
lines changed

33 files changed

+159
-271
lines changed

‎.github/workflows/cloud.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- name: Install Rust
7272
uses: actions-rust-lang/setup-rust-toolchain@v1
7373
with:
74-
toolchain: nightly-2024-07-15
74+
toolchain: 1.84.1
7575
# override: true # this is by default on
7676
rustflags: ""
7777
components: rustfmt

‎.github/workflows/drivers-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
- name: Install Rust
105105
uses: actions-rust-lang/setup-rust-toolchain@v1
106106
with:
107-
toolchain: nightly-2024-07-15
107+
toolchain: 1.84.1
108108
# override: true # this is by default on
109109
rustflags: ""
110110
components: rustfmt

‎.github/workflows/master.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Install Rust
5656
uses: actions-rust-lang/setup-rust-toolchain@v1
5757
with:
58-
toolchain: nightly-2024-07-15
58+
toolchain: 1.84.1
5959
# override: true # this is by default on
6060
rustflags: ""
6161
components: rustfmt

‎.github/workflows/post-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install Rust
3333
uses: actions-rust-lang/setup-rust-toolchain@v1
3434
with:
35-
toolchain: nightly-2024-07-15
35+
toolchain: 1.84.1
3636
# override: true # this is by default on
3737
rustflags: ""
3838
components: rustfmt

‎.github/workflows/publish.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Install Rust
2323
uses: actions-rust-lang/setup-rust-toolchain@v1
2424
with:
25-
toolchain: nightly-2024-07-15
25+
toolchain: 1.84.1
2626
# override: true # this is by default on
2727
rustflags: ""
2828
components: rustfmt
@@ -95,7 +95,7 @@ jobs:
9595
- name: Install Rust
9696
uses: actions-rust-lang/setup-rust-toolchain@v1
9797
with:
98-
toolchain: nightly-2024-07-15
98+
toolchain: 1.84.1
9999
# override: true # this is by default on
100100
rustflags: ""
101101
components: rustfmt
@@ -185,7 +185,7 @@ jobs:
185185
- name: Install Rust
186186
uses: actions-rust-lang/setup-rust-toolchain@v1
187187
with:
188-
toolchain: nightly-2024-07-15
188+
toolchain: 1.84.1
189189
# override: true # this is by default on
190190
rustflags: ""
191191
components: rustfmt
@@ -260,7 +260,7 @@ jobs:
260260
- name: Install Rust
261261
uses: actions-rust-lang/setup-rust-toolchain@v1
262262
with:
263-
toolchain: nightly-2024-07-15
263+
toolchain: 1.84.1
264264
# override: true # this is by default on
265265
rustflags: ""
266266
components: rustfmt

‎.github/workflows/push.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
- name: Install Rust
7373
uses: actions-rust-lang/setup-rust-toolchain@v1
7474
with:
75-
toolchain: nightly-2024-07-15
75+
toolchain: 1.84.1
7676
# override: true # this is by default on
7777
rustflags: ""
7878
components: rustfmt
@@ -152,7 +152,7 @@ jobs:
152152
- name: Install Rust
153153
uses: actions-rust-lang/setup-rust-toolchain@v1
154154
with:
155-
toolchain: nightly-2024-07-15
155+
toolchain: 1.84.1
156156
# override: true # this is by default on
157157
rustflags: ""
158158
components: rustfmt
@@ -215,7 +215,7 @@ jobs:
215215
- name: Install Rust
216216
uses: actions-rust-lang/setup-rust-toolchain@v1
217217
with:
218-
toolchain: nightly-2024-07-15
218+
toolchain: 1.84.1
219219
# override: true # this is by default on
220220
rustflags: ""
221221
components: rustfmt
@@ -337,7 +337,7 @@ jobs:
337337
- name: Install Rust
338338
uses: actions-rust-lang/setup-rust-toolchain@v1
339339
with:
340-
toolchain: nightly-2024-07-15
340+
toolchain: 1.84.1
341341
# override: true # this is by default on
342342
rustflags: ""
343343
components: rustfmt
@@ -414,7 +414,7 @@ jobs:
414414
- name: Install Rust
415415
uses: actions-rust-lang/setup-rust-toolchain@v1
416416
with:
417-
toolchain: nightly-2024-07-15
417+
toolchain: 1.84.1
418418
# override: true # this is by default on
419419
rustflags: ""
420420
components: rustfmt
@@ -641,7 +641,7 @@ jobs:
641641
- name: Install Rust
642642
uses: actions-rust-lang/setup-rust-toolchain@v1
643643
with:
644-
toolchain: nightly-2024-07-15
644+
toolchain: 1.84.1
645645
# override: true # this is by default on
646646
rustflags: ""
647647
components: rustfmt

‎.github/workflows/rust-cubesql.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install Rust
3333
uses: actions-rust-lang/setup-rust-toolchain@v1
3434
with:
35-
toolchain: nightly-2024-07-15
35+
toolchain: 1.84.1
3636
# override: true # this is by default on
3737
rustflags: ""
3838
components: rustfmt, clippy
@@ -138,7 +138,7 @@ jobs:
138138
- name: Install Rust
139139
uses: actions-rust-lang/setup-rust-toolchain@v1
140140
with:
141-
toolchain: nightly-2024-07-15
141+
toolchain: 1.84.1
142142
# override: true # this is by default on
143143
rustflags: ""
144144
components: rustfmt
@@ -244,7 +244,7 @@ jobs:
244244
- name: Install Rust
245245
uses: actions-rust-lang/setup-rust-toolchain@v1
246246
with:
247-
toolchain: nightly-2024-07-15
247+
toolchain: 1.84.1
248248
# override: true # this is by default on
249249
rustflags: ""
250250
components: rustfmt
@@ -327,7 +327,7 @@ jobs:
327327
- name: Install Rust
328328
uses: actions-rust-lang/setup-rust-toolchain@v1
329329
with:
330-
toolchain: nightly-2024-07-15
330+
toolchain: 1.84.1
331331
# override: true # this is by default on
332332
rustflags: ""
333333
components: rustfmt

‎packages/cubejs-backend-native/.cargo/config.toml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
11
# Please keep in sync this file with rust/cubesql!
2-
3-
[target."x86_64-unknown-linux-gnu"]
4-
rustflags = ["-C", "link-arg=-fuse-ld=lld"]
5-
6-
[target."aarch64-unknown-linux-gnu"]
7-
rustflags = ["-C", "link-arg=-fuse-ld=lld"]

‎packages/cubejs-backend-native/rust-toolchain.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
2-
channel = "nightly-2024-07-15"
2+
channel = "1.84.1"
33
components = ["rustfmt", "clippy"]
4-
profile = "minimal"
4+
profile = "minimal"

‎packages/cubejs-backend-native/src/node_obj_deserializer.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl<'a, 'b> JsValueDeserializer<'a, 'b> {
4141
}
4242
}
4343

44-
impl<'de, 'a, 'b> Deserializer<'de> for JsValueDeserializer<'a, 'b> {
44+
impl<'de> Deserializer<'de> for JsValueDeserializer<'_, '_> {
4545
type Error = JsDeserializationError;
4646

4747
fn deserialize_any<V>(self, visitor: V) -> Result<V::Value, Self::Error>
@@ -294,7 +294,7 @@ impl<'a, 'b> JsObjectDeserializer<'a, 'b> {
294294

295295
// `MapAccess` is provided to the `Visitor` to give it the ability to iterate
296296
// through entries of the map.
297-
impl<'de, 'a, 'b> MapAccess<'de> for JsObjectDeserializer<'a, 'b> {
297+
impl<'de> MapAccess<'de> for JsObjectDeserializer<'_, '_> {
298298
type Error = JsDeserializationError;
299299

300300
fn next_key_seed<K>(&mut self, seed: K) -> Result<Option<K::Value>, Self::Error>
@@ -343,7 +343,7 @@ impl<'a, 'b> JsArrayDeserializer<'a, 'b> {
343343

344344
// `SeqAccess` is provided to the `Visitor` to give it the ability to iterate
345345
// through elements of the sequence.
346-
impl<'de, 'a, 'b> SeqAccess<'de> for JsArrayDeserializer<'a, 'b> {
346+
impl<'de> SeqAccess<'de> for JsArrayDeserializer<'_, '_> {
347347
type Error = JsDeserializationError;
348348

349349
fn next_element_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>, Self::Error>
@@ -381,7 +381,7 @@ impl<'a, 'b> JsEnumDeserializer<'a, 'b> {
381381

382382
// `EnumAccess` is provided to the `Visitor` to give it the ability to determine
383383
// which variant of the enum is supposed to be deserialized.
384-
impl<'de, 'a, 'b> EnumAccess<'de> for JsEnumDeserializer<'a, 'b> {
384+
impl<'de> EnumAccess<'de> for JsEnumDeserializer<'_, '_> {
385385
type Error = JsDeserializationError;
386386
type Variant = Self;
387387

@@ -394,7 +394,7 @@ impl<'de, 'a, 'b> EnumAccess<'de> for JsEnumDeserializer<'a, 'b> {
394394
}
395395
}
396396

397-
impl<'de, 'a, 'b> VariantAccess<'de> for JsEnumDeserializer<'a, 'b> {
397+
impl<'de> VariantAccess<'de> for JsEnumDeserializer<'_, '_> {
398398
type Error = JsDeserializationError;
399399

400400
// If the `Visitor` expected this variant to be a unit variant, the input

0 commit comments

Comments
 (0)