Include new proc macros crate

Author: mmastrac

Cargo.toml

@@ -17,7 +17,7 @@ members = [
     "gel-tokio",
     "examples/globals",
     "examples/query-error",
-    "tests",
+    "tests", "gel-protogen-proc-macros",
 ]
 
 [profile.release]

gel-auth/src/gel/server_state_machine.rs

@@ -1,5 +1,5 @@
-use gel_db_protocol::prelude::*;
 use gel_db_protocol::errors::EdbError;
+use gel_db_protocol::prelude::*;
 use gel_db_protocol::protocol::{
     Annotation, AuthenticationOkBuilder, AuthenticationRequiredSASLMessageBuilder,
     AuthenticationSASLContinueBuilder, AuthenticationSASLFinalBuilder,

gel-db-protocol/src/errors.rs

@@ -1,4 +1,3 @@
-
 #[derive(
     Clone, Copy, PartialEq, Eq, derive_more::Debug, derive_more::Error, derive_more::Display,
 )]

gel-db-protocol/src/lib.rs

@@ -1,4 +1,4 @@
-pub mod protocol;
 pub mod errors;
+pub mod protocol;
 
 pub use gel_protogen::prelude;

gel-frontend/Cargo.toml

@@ -34,7 +34,7 @@ hexdump = "0.1.2"
 tracing = "0"
 tracing-subscriber = "0"
 x509-parser = "0.17"
-derive-io = { version = "=0.3.3", features = ["tokio"] }
+derive-io = { version = "=0.5.0", features = ["tokio"] }
 unflatter = "0.1.1"
 consume_on_drop = "0.1.1"
 tokio-util = "0.7"

gel-frontend/examples/listener.rs

@@ -10,11 +10,11 @@ use gel_frontend::listener::BoundServer;
 use gel_frontend::service::{AuthTarget, BabelfishService, ConnectionIdentity, StreamLanguage};
 use gel_frontend::stream::ListenerStream;
 use gel_pg_protocol::prelude::*;
-use uuid::Uuid;
 use hyper::Response;
 use tokio::io::ReadBuf;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tracing::trace;
+use uuid::Uuid;
 
 #[derive(Clone, Debug, Default)]
 struct ExampleService {

gel-protogen-proc-macros/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+name = "gel-protogen-proc-macros"
+license = "MIT/Apache-2.0"
+version = "0.1.2"
+authors = ["MagicStack Inc. <hello@magic.io>"]
+edition = "2021"
+description = "Macros to make parsing and serializing of PostgreSQL-like protocols easier."
+readme = "README.md"
+rust-version.workspace = true
+
+[lints]
+workspace = true
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = { version = "2", features = ["full", "extra-traits"] }
+quote = "1"
+proc-macro2 = "1"
+
+[dev-dependencies]

gel-protogen-proc-macros/src/lib.rs

@@ -0,0 +1 @@
+

gel-protogen/Cargo.toml

@@ -17,6 +17,7 @@ derive_more = { version = "2", features = ["debug", "display", "deref", "deref_m
 uuid = "1"
 const-str = "0.6"
 type-mapper = "=0.1.2"
+gel-protogen-proc-macros = { path = "../gel-protogen-proc-macros", version = "0.1.2" }
 
 [dev-dependencies]
 pretty_assertions = "1.2.0"

gel-stream/Cargo.toml

@@ -31,10 +31,9 @@ __test_keys = []
 
 [dependencies]
 derive_more = { version = "2", default-features = false, features = ["debug", "constructor", "from", "try_from", "display", "error"] }
-thiserror = "2"
 futures = "0.3"
 smallvec = "1"
-derive-io = "=0.4.1"
+derive-io = "=0.5.0"
 
 # Given that this library may be used in multiple contexts, we want to limit the
 # features we enable by default.