Merge pull request #279 from c410-f3r/misc

wtx-macros-0.4.0

wtx-macros/Cargo.toml

@@ -23,7 +23,7 @@ license = "MIT"
 name = "wtx-macros"
 readme = "README.md"
 repository = "https://github.com/c410-f3r/wtx"
-version = "0.3.0"
+version = "0.4.0"
 
 [package.metadata.docs.rs]
 all-features = true

wtx/Cargo.toml

@@ -8,9 +8,9 @@ chrono = { default-features = false, optional = true, version = "0.4" }
 cl-aux = { default-features = false, optional = true, features = ["alloc"], version = "5.0" }
 crypto-common = { default-features = false, optional = true, version = "0.1" }
 digest = { default-features = false, features = ["mac"], optional = true, version = "0.10" }
-embassy-net = { default-features = false, features = ["tcp"], optional = true, version = "0.4" }
+embassy-net = { default-features = false, features = ["tcp"], optional = true, version = "0.5" }
 embedded-io-async = { default-features = false, optional = true, version = "0.6" }
-embedded-tls = { default-features = false, optional = true, git = "https://github.com/drogue-iot/embedded-tls" }
+embedded-tls = { default-features = false, optional = true, version = "0.17" }
 fastrand = { default-features = false, optional = true, version = "2.0" }
 flate2 = { default-features = false, features = ["zlib-rs"], optional = true, version = "1.0" }
 foldhash = { default-features = false, optional = true, version = "0.1" }
@@ -72,7 +72,7 @@ http-session = ["chrono/serde", "http-cookie-secure", "serde_json"]
 http2 = ["foldhash", "hashbrown", "http"]
 httparse = ["dep:httparse"]
 memchr = ["dep:memchr"]
-nightly = ["hashbrown?/nightly"]
+nightly = [] #FIXME(STABLE): "hashbrown?/nightly"
 optimization = ["memchr", "simdutf8"]
 pool = []
 portable-atomic-util = ["portable-atomic", "dep:portable-atomic-util"]

wtx/src/database.rs

@@ -11,7 +11,7 @@ mod from_records;
 mod json;
 mod misc;
 mod record;
-mod record_values;
+pub(crate) mod record_values;
 mod records;
 #[cfg(feature = "schema-manager")]
 pub mod schema_manager;
@@ -30,7 +30,6 @@ pub use from_records::FromRecords;
 pub use json::Json;
 pub use misc::seek_related_entities;
 pub use record::Record;
-pub(crate) use record_values::encode;
 pub use record_values::RecordValues;
 pub use records::Records;
 pub use stmt_cmd::StmtCmd;

wtx/src/database/client/postgres.rs

@@ -57,7 +57,8 @@ where
   const TY: DatabaseTy = DatabaseTy::Postgres;
 
   type DecodeValue<'exec> = DecodeValue<'exec>;
-  type EncodeValue<'buffer, 'tmp> = EncodeValue<'buffer, 'tmp>
+  type EncodeValue<'buffer, 'tmp>
+    = EncodeValue<'buffer, 'tmp>
   where
     'buffer: 'tmp;
   type Error = E;
@@ -75,7 +76,7 @@ impl<E> Default for Postgres<E> {
 
 #[cfg(test)]
 mod tests {
-  use crate::database::client::postgres::{statements::Column, Ty};
+  use crate::database::client::postgres::{statements::column::Column, Ty};
 
   pub(crate) fn column0() -> Column {
     Column::new("a".try_into().unwrap(), Ty::VarcharArray)

wtx/src/database/client/postgres/executor.rs

@@ -119,7 +119,8 @@ where
   S: Stream,
 {
   type Database = Postgres<E>;
-  type TransactionManager<'tm> = TransactionManager<'tm, E, EB, S>
+  type TransactionManager<'tm>
+    = TransactionManager<'tm, E, EB, S>
   where
     Self: 'tm;
 

wtx/src/database/client/postgres/executor/authentication.rs

@@ -11,8 +11,8 @@ use crate::{
     Identifier,
   },
   misc::{
-    bytes_split1, from_utf8_basic, ArrayVector, ConnectionState, FilledBufferWriter, LeaseMut,
-    PartitionedFilledBuffer, Rng, Stream, Vector,
+    bytes_split1, from_utf8_basic, partitioned_filled_buffer::PartitionedFilledBuffer, ArrayVector,
+    ConnectionState, FilledBufferWriter, LeaseMut, Rng, Stream, Vector,
   },
 };
 use base64::prelude::{Engine as _, BASE64_STANDARD};

wtx/src/database/client/postgres/executor/fetch.rs

@@ -3,14 +3,14 @@ use crate::{
     client::postgres::{
       executor::commons::FetchWithStmtCommons,
       message::{Message, MessageTy},
-      statements::Statement,
+      statements::statement::Statement,
       Executor, ExecutorBuffer, Postgres, PostgresError, Record,
     },
     RecordValues,
   },
   misc::{
-    ConnectionState, LeaseMut, PartitionedFilledBuffer, Stream, Usize, Vector, _read_header,
-    _read_payload,
+    partitioned_filled_buffer::PartitionedFilledBuffer, ConnectionState, LeaseMut, Stream, Usize,
+    Vector, _read_header, _read_payload,
   },
 };
 use core::ops::Range;

wtx/src/database/client/postgres/executor/prepare.rs

@@ -6,13 +6,16 @@ use crate::{
       message::MessageTy,
       msg_field::MsgField,
       protocol::{bind, describe, execute, parse, sync},
-      statements::{Column, Statement, StatementsMisc},
+      statements::{column::Column, statement::Statement, statements_misc::StatementsMisc},
       ty::Ty,
       Executor, Postgres, PostgresError, Statements,
     },
     RecordValues, StmtCmd,
   },
-  misc::{ArrayString, FilledBufferWriter, LeaseMut, PartitionedFilledBuffer, Stream},
+  misc::{
+    partitioned_filled_buffer::PartitionedFilledBuffer, ArrayString, FilledBufferWriter, LeaseMut,
+    Stream,
+  },
 };
 
 impl<E, EB, S> Executor<E, EB, S>

wtx/src/database/client/postgres/executor_buffer.rs

@@ -1,6 +1,6 @@
 use crate::{
   database::{client::postgres::Statements, Identifier},
-  misc::{Lease, LeaseMut, PartitionedFilledBuffer, Rng, Vector},
+  misc::{partitioned_filled_buffer::PartitionedFilledBuffer, Lease, LeaseMut, Rng, Vector},
 };
 use core::ops::Range;
 use hashbrown::HashMap;

wtx/src/database/client/postgres/protocol.rs

@@ -1,6 +1,8 @@
 use crate::{
   database::{
-    client::postgres::{statements::Statement, Config, EncodeValue, Oid, Postgres, PostgresError},
+    client::postgres::{
+      statements::statement::Statement, Config, EncodeValue, Oid, Postgres, PostgresError,
+    },
     RecordValues,
   },
   misc::{FilledBufferWriter, Vector},

wtx/src/database/client/postgres/record.rs

@@ -1,6 +1,6 @@
 use crate::{
   database::{
-    client::postgres::{statements::Statement, DecodeValue, Postgres, PostgresError},
+    client::postgres::{statements::statement::Statement, DecodeValue, Postgres, PostgresError},
     Database, ValueIdent,
   },
   misc::{Vector, _unlikely_dflt, _unlikely_elem},
@@ -176,7 +176,7 @@ mod tests {
   use crate::{
     database::{
       client::postgres::{
-        statements::Statement,
+        statements::statement::Statement,
         tests::{column0, column1, column2},
         DecodeValue, Record, Ty,
       },

wtx/src/database/client/postgres/records.rs

@@ -1,4 +1,4 @@
-use crate::database::client::postgres::{statements::Statement, Postgres, Record};
+use crate::database::client::postgres::{statements::statement::Statement, Postgres, Record};
 use core::{marker::PhantomData, ops::Range};
 
 /// Records
@@ -89,7 +89,7 @@ mod tests {
   use crate::{
     database::{
       client::postgres::{
-        statements::Statement,
+        statements::statement::Statement,
         tests::{column0, column1, column2},
         DecodeValue, Record, Records, Ty,
       },

wtx/src/database/client/postgres/statements.rs

@@ -1,25 +1,21 @@
-mod column;
-mod statement;
-mod statement_builder;
-mod statements_misc;
+pub(crate) mod column;
+pub(crate) mod statement;
+pub(crate) mod statement_builder;
+pub(crate) mod statements_misc;
 
 use crate::{
   database::client::postgres::ty::Ty,
   misc::{BlocksDeque, Rng, _random_state},
 };
-pub(crate) use column::Column;
 use foldhash::fast::FixedState;
 use hashbrown::HashMap;
-pub(crate) use statement::Statement;
-pub(crate) use statement_builder::StatementBuilder;
-pub(crate) use statements_misc::StatementsMisc;
 
 /// Statements
 #[derive(Debug)]
 pub struct Statements {
   max_stmts: usize,
   rs: FixedState,
-  stmts: BlocksDeque<(Column, Ty), StatementsMisc>,
+  stmts: BlocksDeque<(column::Column, Ty), statements_misc::StatementsMisc>,
   stmts_indcs: HashMap<u64, usize>,
 }
 
@@ -56,7 +52,7 @@ impl Statements {
   }
 
   #[inline]
-  pub(crate) fn builder(&mut self) -> StatementBuilder<'_> {
+  pub(crate) fn builder(&mut self) -> statement_builder::StatementBuilder<'_> {
     if self.stmts.blocks_len() >= self.max_stmts {
       let to_remove = (self.max_stmts / 2).max(1);
       for _ in 0..to_remove {
@@ -70,7 +66,7 @@ impl Statements {
         true
       })
     }
-    StatementBuilder::new(&mut self.stmts, &mut self.stmts_indcs)
+    statement_builder::StatementBuilder::new(&mut self.stmts, &mut self.stmts_indcs)
   }
 
   #[inline]
@@ -81,13 +77,13 @@ impl Statements {
   }
 
   #[inline]
-  pub(crate) fn get_by_idx(&self, idx: usize) -> Option<Statement<'_>> {
+  pub(crate) fn get_by_idx(&self, idx: usize) -> Option<statement::Statement<'_>> {
     let stmt = self.stmts.get(idx)?;
-    Some(Statement::new(stmt.misc.columns_len, stmt.misc.types_len, stmt.data))
+    Some(statement::Statement::new(stmt.misc.columns_len, stmt.misc.types_len, stmt.data))
   }
 
   #[inline]
-  pub(crate) fn get_by_stmt_hash(&self, stmt_hash: u64) -> Option<Statement<'_>> {
+  pub(crate) fn get_by_stmt_hash(&self, stmt_hash: u64) -> Option<statement::Statement<'_>> {
     self.get_by_idx(*self.stmts_indcs.get(&stmt_hash)?)
   }
 
@@ -101,7 +97,7 @@ impl Statements {
 mod tests {
   use crate::{
     database::client::postgres::{
-      statements::StatementsMisc,
+      statements::statements_misc::StatementsMisc,
       tests::{column0, column1, column2, column3},
       ty::Ty,
       Statements,

wtx/src/database/client/postgres/statements/statement_builder.rs

@@ -1,7 +1,7 @@
 use crate::{
   database::{
     client::postgres::{
-      statements::{column::Column, StatementsMisc},
+      statements::{column::Column, statements_misc::StatementsMisc},
       Ty,
     },
     Identifier,

wtx/src/database/client/postgres/tys.rs

@@ -25,7 +25,7 @@ macro_rules! test {
     #[cfg(test)]
     #[test]
     fn $name() {
-      let vec = &mut crate::misc::FilledBuffer::_new();
+      let vec = &mut crate::misc::filled_buffer::FilledBuffer::_new();
       let mut fbw = crate::misc::FilledBufferWriter::new(0, vec);
       let mut ev = EncodeValue::new(&mut fbw);
       let instance: $ty = $instance;

wtx/src/http/cookie.rs

@@ -1,12 +1,10 @@
-mod cookie_bytes;
+pub(crate) mod cookie_bytes;
 mod cookie_error;
-mod cookie_generic;
+pub(crate) mod cookie_generic;
 mod same_site;
 
-use crate::misc::{ArrayVector, Rng, Vector, _shift_copyable_chunks};
-pub(crate) use cookie_bytes::CookieBytes;
+use crate::misc::{mem_transfer::_shift_copyable_chunks, ArrayVector, Rng, Vector};
 pub use cookie_error::CookieError;
-pub(crate) use cookie_generic::CookieGeneric;
 use core::str;
 pub use same_site::SameSite;
 

wtx/src/http/req_res_data.rs

@@ -1,8 +1,10 @@
 use crate::{
   http::Headers,
-  misc::{Lease, LeaseMut, Uri, UriString, _EMPTY_URI_STRING},
+  misc::{Lease, LeaseMut, Uri, UriString},
 };
-use alloc::boxed::Box;
+use alloc::{boxed::Box, string::String};
+
+static EMPTY_URI_STRING: UriString = UriString::_empty(String::new());
 
 /// Groups the elements of an HTTP request/response.
 pub trait ReqResData {
@@ -78,7 +80,7 @@ impl ReqResData for &[u8] {
 
   #[inline]
   fn uri(&self) -> &UriString {
-    &_EMPTY_URI_STRING
+    &EMPTY_URI_STRING
   }
 }
 
@@ -97,7 +99,7 @@ impl<const N: usize> ReqResData for [u8; N] {
 
   #[inline]
   fn uri(&self) -> &UriString {
-    &_EMPTY_URI_STRING
+    &EMPTY_URI_STRING
   }
 }
 
@@ -116,7 +118,7 @@ impl ReqResData for () {
 
   #[inline]
   fn uri(&self) -> &UriString {
-    &_EMPTY_URI_STRING
+    &EMPTY_URI_STRING
   }
 }
 
@@ -138,7 +140,7 @@ where
 
   #[inline]
   fn uri(&self) -> &UriString {
-    &_EMPTY_URI_STRING
+    &EMPTY_URI_STRING
   }
 }
 
@@ -160,7 +162,7 @@ where
 
   #[inline]
   fn uri(&self) -> &UriString {
-    &_EMPTY_URI_STRING
+    &EMPTY_URI_STRING
   }
 }
 
@@ -179,7 +181,7 @@ impl ReqResData for Headers {
 
   #[inline]
   fn uri(&self) -> &UriString {
-    &_EMPTY_URI_STRING
+    &EMPTY_URI_STRING
   }
 }
 
@@ -201,7 +203,7 @@ where
 
   #[inline]
   fn uri(&self) -> &UriString {
-    &_EMPTY_URI_STRING
+    &EMPTY_URI_STRING
   }
 }
 
@@ -282,7 +284,7 @@ impl ReqResDataMut for Headers {
 
   #[inline]
   fn parts_mut(&mut self) -> (&mut Self::Body, &mut Headers, &UriString) {
-    (&mut [], self, &_EMPTY_URI_STRING)
+    (&mut [], self, &EMPTY_URI_STRING)
   }
 }
 
@@ -295,6 +297,6 @@ where
 
   #[inline]
   fn parts_mut(&mut self) -> (&mut Self::Body, &mut Headers, &UriString) {
-    (&mut self.0, self.1.lease_mut(), &_EMPTY_URI_STRING)
+    (&mut self.0, self.1.lease_mut(), &EMPTY_URI_STRING)
   }
 }

wtx/src/http/session/session_decoder.rs

@@ -1,6 +1,6 @@
 use crate::{
   http::{
-    cookie::{decrypt, CookieBytes},
+    cookie::{cookie_bytes::CookieBytes, decrypt},
     server_framework::Middleware,
     KnownHeaderName, ReqResBuffer, Request, Response, SessionError, SessionManager,
     SessionManagerInner, SessionState, SessionStore, StatusCode,

wtx/src/http/session/session_manager.rs

@@ -1,6 +1,6 @@
 use crate::{
   http::{
-    cookie::{encrypt, CookieGeneric},
+    cookie::{cookie_generic::CookieGeneric, encrypt},
     session::SessionKey,
     Header, KnownHeaderName, ReqResBuffer, ReqResDataMut, SessionManagerBuilder, SessionState,
     SessionStore,

wtx/src/http/session/session_manager_builder.rs

@@ -1,6 +1,6 @@
 use crate::{
   http::{
-    cookie::{CookieGeneric, SameSite},
+    cookie::{cookie_generic::CookieGeneric, SameSite},
     session::{SessionKey, SessionManagerInner},
     SessionManager, SessionStore,
   },