Merge branch 'main' into patch-1

Author: sandhose

Cargo.lock

@@ -202,7 +202,7 @@ features = ["derive", "attr", "with-uuid", "with-chrono", "postgres-array"]
 
 # Query builder
 [workspace.dependencies.sea-query-binder]
-version = "0.7.0-rc.1"
+version = "0.7.0-rc.2"
 features = [
     "sqlx",
     "sqlx-postgres",
@@ -311,8 +311,3 @@ sha2.opt-level = 3
 digest.opt-level = 3
 block-buffer.opt-level = 3
 generic-array.opt-level = 3
-
-[patch.crates-io]
-# Waiting for https://github.com/SeaQL/sea-query/pull/810
-sea-query = { git = "https://github.com/sandhose/sea-query", branch = "binder/relax-sqlx-dependency" }
-sea-query-binder = { git = "https://github.com/sandhose/sea-query", branch = "binder/relax-sqlx-dependency" }

Cargo.toml

@@ -21,7 +21,10 @@ trait AsInjector {
 }
 
 impl<B> AsInjector for Request<B> {
-    type Injector<'a> = HeaderInjector<'a> where Self: 'a;
+    type Injector<'a>
+        = HeaderInjector<'a>
+    where
+        Self: 'a;
 
     fn as_injector(&mut self) -> Self::Injector<'_> {
         HeaderInjector(self.headers_mut())

crates/tower/src/trace_context.rs

@@ -90,4 +90,4 @@ deny = ["oldtime"]
 unknown-registry = "warn"
 unknown-git = "warn"
 allow-registry = ["https://github.com/rust-lang/crates.io-index"]
-allow-git = ["https://github.com/sandhose/sea-query"]
+allow-git = []