diff --git a/Cargo.lock b/Cargo.lock index 2479456482..67e9d12531 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1995,6 +1995,7 @@ version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ + "bindgen", "cc", "pkg-config", "vcpkg", @@ -3306,17 +3307,6 @@ dependencies = [ "der", ] -[[package]] -name = "sqlformat" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" -dependencies = [ - "itertools 0.12.1", - "nom", - "unicode_categories", -] - [[package]] name = "sqlx" version = "0.8.2" @@ -3409,7 +3399,6 @@ dependencies = [ "serde_json", "sha2", "smallvec", - "sqlformat", "sqlx", "thiserror", "time", @@ -4140,12 +4129,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - [[package]] name = "untrusted" version = "0.9.0" diff --git a/sqlx-core/Cargo.toml b/sqlx-core/Cargo.toml index 16c8b799f5..789d30fb1c 100644 --- a/sqlx-core/Cargo.toml +++ b/sqlx-core/Cargo.toml @@ -69,7 +69,7 @@ regex = { version = "1.5.5", optional = true } serde = { version = "1.0.132", features = ["derive", "rc"], optional = true } serde_json = { version = "1.0.73", features = ["raw_value"], optional = true } sha2 = { version = "0.10.0", default-features = false, optional = true } -sqlformat = "0.2.0" +#sqlformat = "0.2.0" thiserror = "1.0.30" tokio-stream = { version = "0.1.8", features = ["fs"], optional = true } tracing = { version = "0.1.37", features = ["log"] } diff --git a/sqlx-core/src/logger.rs b/sqlx-core/src/logger.rs index 41725df99b..cf6dd533bd 100644 --- a/sqlx-core/src/logger.rs +++ b/sqlx-core/src/logger.rs @@ -60,8 +60,6 @@ pub(crate) fn private_level_filter_to_trace_level( private_level_filter_to_levels(filter).map(|(level, _)| level) } -pub use sqlformat; - pub struct QueryLogger<'q> { sql: &'q str, rows_returned: u64, @@ -112,11 +110,12 @@ impl<'q> QueryLogger<'q> { summary.push_str(" …"); format!( "\n\n{}\n", - sqlformat::format( - self.sql, - &sqlformat::QueryParams::None, - sqlformat::FormatOptions::default() - ) + self.sql /* + sqlformat::format( + self.sql, + &sqlformat::QueryParams::None, + sqlformat::FormatOptions::default() + )*/ ) } else { String::new() diff --git a/sqlx-sqlite/src/logger.rs b/sqlx-sqlite/src/logger.rs index 40fabd48ed..3abed8cebc 100644 --- a/sqlx-sqlite/src/logger.rs +++ b/sqlx-sqlite/src/logger.rs @@ -416,11 +416,13 @@ impl<'q, R: Debug, S: Debug + DebugDiff, P: Debug> QueryPlanLogger<'q, R, S, P> summary.push_str(" …"); format!( "\n\n{}\n", - sqlformat::format( - self.sql, - &sqlformat::QueryParams::None, - sqlformat::FormatOptions::default() - ) + self.sql /* + sqlformat::format( + self.sql, + &sqlformat::QueryParams::None, + sqlformat::FormatOptions::default() + ) + */ ) } else { String::new() diff --git a/src/ty_match.rs b/src/ty_match.rs index 9a34f0db3b..0b2309ae60 100644 --- a/src/ty_match.rs +++ b/src/ty_match.rs @@ -128,7 +128,7 @@ pub fn dupe_value(_t: &T) -> T { #[test] fn test_dupe_value() { - let ref val = (String::new(),); + let val = &(String::new(),); if false { let _: i32 = dupe_value(&0i32);