Skip to content

Commit

Permalink
feat(cubesql): Upgrade rust to nightly-2024-07-15 (#8473)
Browse files Browse the repository at this point in the history
  • Loading branch information
ovr authored Jul 17, 2024
1 parent e4ebec3 commit 6a6a7fe
Show file tree
Hide file tree
Showing 20 changed files with 89 additions and 142 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/drivers-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-12-13
toolchain: nightly-2024-07-15
# override: true # this is by default on
rustflags: ""
components: rustfmt
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-12-13
toolchain: nightly-2024-07-15
# override: true # this is by default on
rustflags: ""
components: rustfmt
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-12-13
toolchain: nightly-2024-07-15
# override: true # this is by default on
rustflags: ""
components: rustfmt
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-12-13
toolchain: nightly-2024-07-15
# override: true # this is by default on
rustflags: ""
components: rustfmt
Expand Down Expand Up @@ -256,7 +256,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-12-13
toolchain: nightly-2024-07-15
# override: true # this is by default on
rustflags: ""
components: rustfmt
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-12-13
toolchain: nightly-2024-07-15
# override: true # this is by default on
rustflags: ""
components: rustfmt
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-12-13
toolchain: nightly-2024-07-15
# override: true # this is by default on
rustflags: ""
components: rustfmt
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-12-13
toolchain: nightly-2024-07-15
# override: true # this is by default on
rustflags: ""
components: rustfmt
Expand Down Expand Up @@ -335,7 +335,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-12-13
toolchain: nightly-2024-07-15
# override: true # this is by default on
rustflags: ""
components: rustfmt
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/rust-cubesql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-12-13
toolchain: nightly-2024-07-15
# override: true # this is by default on
rustflags: ""
components: rustfmt, clippy
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-12-13
toolchain: nightly-2024-07-15
# override: true # this is by default on
rustflags: ""
components: rustfmt
Expand Down Expand Up @@ -230,7 +230,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-12-13
toolchain: nightly-2024-07-15
# override: true # this is by default on
rustflags: ""
components: rustfmt
Expand Down Expand Up @@ -313,7 +313,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-12-13
toolchain: nightly-2024-07-15
# override: true # this is by default on
rustflags: ""
components: rustfmt
Expand Down
28 changes: 14 additions & 14 deletions packages/cubejs-backend-native/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/cubejs-backend-native/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@ features = ["napi-1", "napi-4", "napi-6", "futures"]

[features]
default = ["neon-entrypoint"]
neon-debug = []
neon-entrypoint = []
python = ["pyo3", "pyo3-asyncio"]
2 changes: 1 addition & 1 deletion packages/cubejs-backend-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@cubejs-backend/linter": "^0.35.0",
"@types/jest": "^27",
"@types/node": "^14",
"cargo-cp-artifact": "^0.1",
"cargo-cp-artifact": "^0.1.9",
"jest": "^27",
"pg": "^8.11.3",
"typescript": "~5.2.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/cubejs-backend-native/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2023-12-13"
components = ["rustfmt", "rustc-dev", "clippy"]
channel = "nightly-2024-07-15"
components = ["rustfmt", "clippy"]
profile = "minimal"
4 changes: 2 additions & 2 deletions packages/cubejs-backend-native/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ impl NodeConfig {
self.config.configure().await;

injector
.register_typed::<dyn TransportService, _, _, _>(async move |_| transport)
.register_typed::<dyn TransportService, _, _, _>(|_| async move { transport })
.await;

injector
.register_typed::<dyn SqlAuthService, _, _, _>(async move |_| auth)
.register_typed::<dyn SqlAuthService, _, _, _>(|_| async move { auth })
.await;

self.config.cube_services().await
Expand Down
2 changes: 1 addition & 1 deletion packages/cubejs-backend-native/src/cross/py_in_js.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ impl Finalize for JsPyFunctionWrapper {}
pub type BoxedJsPyFunctionWrapper = JsBox<RefCell<JsPyFunctionWrapper>>;

pub fn cl_repr_py_function_wrapper(mut cx: FunctionContext) -> JsResult<JsPromise> {
#[cfg(build = "debug")]
#[cfg(feature = "neon-debug")]
trace!("cl_repr_py_function_wrapper {}", _fun_name);

let (deferred, promise) = cx.promise();
Expand Down
Loading

0 comments on commit 6a6a7fe

Please sign in to comment.