feat(cubesql): Allow to upgrade Rust to stable

Author: ovr

packages/cubejs-backend-native/Cargo.lock

@@ -11,8 +11,7 @@ homepage = "https://cube.dev"
 [dependencies]
 arc-swap = "1"
 datafusion = { git = 'https://github.com/cube-js/arrow-datafusion.git', rev = "dcf3e4aa26fd112043ef26fa4a78db5dbd443c86", default-features = false, features = ["regex_expressions", "unicode_expressions"] }
-anyhow = "1.0"
-thiserror = "1.0.50"
+thiserror = "2"
 cubeclient = { path = "../cubeclient" }
 pg-srv = { path = "../pg-srv" }
 sqlparser = { git = 'https://github.com/cube-js/sqlparser-rs.git', rev = "6a54d27d3b75a04b9f9cbe309a83078aa54b32fd" }
@@ -25,8 +24,6 @@ bytes = "1.2"
 futures = "0.3.23"
 rand = "0.8.3"
 hashbrown = "0.14.3"
-smallvec = "1.7.0"
-byteorder = "1.3.4"
 log = "0.4.21"
 rust_decimal = { version = "1.25", features = ["c-repr", "db-postgres"]}
 postgres-types = "0.2.3"
@@ -41,13 +38,11 @@ uuid = { version = "1", features = ["serde", "v4"] }
 bincode = "1.3.1"
 chrono = "0.4.31"
 chrono-tz = "0.6"
-mockall = "0.8.1"
 tokio-util = { version = "0.7", features=["compat"] }
 comfy-table = "7.1.0"
 bitflags = "1.3.2"
 egg = { rev = "952f8c2a1033e5da097d23c523b0d8e392eb532b", git = "https://github.com/cube-js/egg.git", features = ["serde-1"] }
 paste = "1.0.6"
-csv = "1.1.6"
 tracing = { version = "0.1.40", features = ["async-await"] }
 async-stream = "0.3.3"
 futures-core = "0.3.23"

rust/cubesql/Cargo.lock

@@ -1,17 +1,34 @@
-use std::{backtrace::Backtrace, collections::HashMap};
+use std::{backtrace::Backtrace, collections::HashMap, fmt::Formatter};
 
-#[derive(thiserror::Error, Debug)]
+/// TODO: Migrate back to thiserror crate, when Rust will stabilize feature(error_generic_member_access)
+#[derive(Debug)]
 pub enum CompilationError {
-    #[error("SQLCompilationError: Internal: {0}")]
     Internal(String, Backtrace, Option<HashMap<String, String>>),
-    #[error("SQLCompilationError: User: {0}")]
     User(String, Option<HashMap<String, String>>),
-    #[error("SQLCompilationError: Unsupported: {0}")]
     Unsupported(String, Option<HashMap<String, String>>),
-    #[error("SQLCompilationError: Fatal: {0}")]
     Fatal(String, Option<HashMap<String, String>>),
 }
 
+impl std::fmt::Display for CompilationError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            CompilationError::Internal(message, _, _) => {
+                f.write_fmt(format_args!("SQLCompilationError: Internal: {}", message))
+            }
+            CompilationError::User(message, _) => {
+                f.write_fmt(format_args!("SQLCompilationError: User: {}", message))
+            }
+            CompilationError::Unsupported(message, _) => f.write_fmt(format_args!(
+                "SQLCompilationError: Unsupported: {}",
+                message
+            )),
+            CompilationError::Fatal(message, _) => {
+                f.write_fmt(format_args!("SQLCompilationError: Fatal: {}", message))
+            }
+        }
+    }
+}
+
 impl PartialEq for CompilationError {
     fn eq(&self, other: &Self) -> bool {
         match &self {

rust/cubesql/cubesql/Cargo.toml

@@ -2,16 +2,8 @@
     // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
     clippy::nonstandard_macro_braces,
 )]
-#![feature(test)]
-// #![feature(backtrace)]
-#![feature(async_closure)]
-#![feature(box_patterns)]
-// #![feature(slice_internals)]
-#![feature(vec_into_raw_parts)]
-#![feature(hash_set_entry)]
 // #![feature(trace_macros)]
 #![recursion_limit = "2048"]
-#![feature(error_generic_member_access)]
 
 // trace_macros!(false);
 

rust/cubesql/cubesql/src/compile/error.rs

@@ -18,7 +18,7 @@ async-trait = "0.1.36"
 log = "0.4"
 bytes = "1.2"
 byteorder = "1.4"
-thiserror = "1.0.50"
+thiserror = "2"
 chrono = { version = "0.4", package = "chrono", default-features = false, features = [
     "clock",
 ], optional = true }

rust/cubesql/cubesql/src/lib.rs

@@ -2,10 +2,6 @@
 //! You can find overview of the protocol at
 //! <https://www.postgresql.org/docs/10/protocol.html>
 
-// #![feature(backtrace)]
-// #![feature(type_ascription)]
-#![feature(error_generic_member_access)]
-
 mod decoding;
 mod encoding;
 
@@ -20,25 +16,51 @@ pub use encoding::*;
 pub use extended::*;
 pub use pg_type::*;
 
-use std::backtrace::Backtrace;
+use std::{backtrace::Backtrace, fmt::Formatter};
 
 /// Protocol error abstract of handled/unhandled errors, it should not handle any kind of business logic errors
-#[derive(thiserror::Error, Debug)]
+/// TODO: Migrate back to thiserror crate, when Rust will stabilize feature(error_generic_member_access)
+#[derive(Debug)]
 pub enum ProtocolError {
-    #[error("IO Error: {}", .source)]
     IO {
-        #[from]
         source: std::io::Error,
         backtrace: Backtrace,
     },
-    #[error("Error: {}", .source.message)]
     ErrorResponse {
-        #[from]
         source: protocol::ErrorResponse,
         backtrace: Backtrace,
     },
 }
 
+impl std::fmt::Display for ProtocolError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ProtocolError::IO { source, .. } => f.write_fmt(format_args!("IO error: {}", source)),
+            ProtocolError::ErrorResponse { source, .. } => {
+                f.write_fmt(format_args!("IO error: {}", source))
+            }
+        }
+    }
+}
+
+impl From<std::io::Error> for ProtocolError {
+    fn from(source: std::io::Error) -> Self {
+        ProtocolError::IO {
+            source,
+            backtrace: Backtrace::capture(),
+        }
+    }
+}
+
+impl From<protocol::ErrorResponse> for ProtocolError {
+    fn from(source: protocol::ErrorResponse) -> Self {
+        ProtocolError::ErrorResponse {
+            source,
+            backtrace: Backtrace::capture(),
+        }
+    }
+}
+
 impl ProtocolError {
     /// Return Backtrace from any variant of Enum
     pub fn backtrace(&self) -> Option<&Backtrace> {