Skip to content

Commit b3777c3

Browse files
authored
chore(cubesql): Remove usage of nightly features (#9215)
This PR unblocks an ability to upgrade rust to stable 1.84.1. Usage of the `thiserror` crate was removed for two error structures (`ProtocolError` from `pg-srv` and `CompilationError` from `cubesql`) because using Backtrace in errors requires a nightly compiler with Rust version 1.73 or newer. Move it to manual implementation.
1 parent 18b82e0 commit b3777c3

File tree

10 files changed

+204
-454
lines changed

10 files changed

+204
-454
lines changed

packages/cubejs-backend-native/Cargo.lock

Lines changed: 47 additions & 142 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/cubejs-backend-native/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
#![feature(async_closure)]
2-
#![feature(thread_id_value)]
31
#![allow(clippy::result_large_err)]
42

3+
#[cfg(feature = "python")]
54
extern crate findshlibs;
65

76
pub mod auth;

packages/cubejs-backend-native/src/template/workers.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ impl JinjaEngineWorker {
5151
);
5252
} else {
5353
trace!(
54-
"Closing jinja thread, id: {}, threadId: {}",
54+
"Closing jinja thread, id: {}, threadId: {:?}",
5555
id,
56-
std::thread::current().id().as_u64()
56+
// TODO: Use as_u64 when it will be stable - https://github.com/rust-lang/rust/issues/67939
57+
std::thread::current().id()
5758
);
5859

5960
return;

0 commit comments

Comments
 (0)