From 07b212506d6504a1d86becd5f1367749279bd347 Mon Sep 17 00:00:00 2001 From: Sanpi Date: Thu, 20 Feb 2025 21:55:13 +0100 Subject: [PATCH] cargo fmt --- codegen/src/main.rs | 4 +++- src/ffi.rs | 6 +----- src/pipeline.rs | 30 +++++------------------------- src/result/mod.rs | 12 ++---------- 4 files changed, 11 insertions(+), 41 deletions(-) diff --git a/codegen/src/main.rs b/codegen/src/main.rs index 0398aa9..49de3c5 100644 --- a/codegen/src/main.rs +++ b/codegen/src/main.rs @@ -25,7 +25,9 @@ fn main() -> Result { } fn download(file: &str, version: u8) -> Result { - let url = format!("https://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f={file};hb=refs/heads/REL_{version}_STABLE"); + let url = format!( + "https://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f={file};hb=refs/heads/REL_{version}_STABLE" + ); let path = std::path::Path::new(file); let file_name = path.file_name().unwrap().to_str().unwrap(); let output = format!("{}/src/{file_name}", env!("CARGO_MANIFEST_DIR")); diff --git a/src/ffi.rs b/src/ffi.rs index dc0bbcf..a61e04d 100644 --- a/src/ffi.rs +++ b/src/ffi.rs @@ -21,11 +21,7 @@ pub(crate) fn to_option_str(s: *const c_char) -> crate::errors::Result crate::errors::Result> { diff --git a/src/pipeline.rs b/src/pipeline.rs index 01df7e7..5565c59 100644 --- a/src/pipeline.rs +++ b/src/pipeline.rs @@ -34,11 +34,7 @@ pub fn enter(conn: &crate::Connection) -> crate::errors::Result { let success = unsafe { pq_sys::PQenterPipelineMode(conn.into()) }; - if success == 1 { - Ok(()) - } else { - conn.error() - } + if success == 1 { Ok(()) } else { conn.error() } } /** @@ -53,11 +49,7 @@ pub fn exit(conn: &crate::Connection) -> crate::errors::Result { let success = unsafe { pq_sys::PQexitPipelineMode(conn.into()) }; - if success == 1 { - Ok(()) - } else { - conn.error() - } + if success == 1 { Ok(()) } else { conn.error() } } /** @@ -82,11 +74,7 @@ pub fn status(conn: &crate::Connection) -> Status { pub fn sync(conn: &crate::Connection) -> crate::errors::Result { let success = unsafe { pq_sys::PQpipelineSync(conn.into()) }; - if success == 1 { - Ok(()) - } else { - conn.error() - } + if success == 1 { Ok(()) } else { conn.error() } } /** @@ -98,11 +86,7 @@ pub fn sync(conn: &crate::Connection) -> crate::errors::Result { pub fn flush_request(conn: &crate::Connection) -> crate::errors::Result { let success = unsafe { pq_sys::PQsendFlushRequest(conn.into()) }; - if success == 1 { - Ok(()) - } else { - conn.error() - } + if success == 1 { Ok(()) } else { conn.error() } } /** @@ -115,11 +99,7 @@ pub fn flush_request(conn: &crate::Connection) -> crate::errors::Result { pub fn send_sync(conn: &crate::Connection) -> crate::errors::Result { let success = unsafe { pq_sys::PQsendPipelineSync(conn.into()) }; - if success == 1 { - Ok(()) - } else { - conn.error() - } + if success == 1 { Ok(()) } else { conn.error() } } #[cfg(test)] diff --git a/src/result/mod.rs b/src/result/mod.rs index b48e9f9..705c64d 100644 --- a/src/result/mod.rs +++ b/src/result/mod.rs @@ -162,11 +162,7 @@ impl PQResult { pub fn field_mod(&self, column: usize) -> Option { let raw = unsafe { pq_sys::PQfmod(self.into(), column as i32) }; - if raw < 0 { - None - } else { - Some(raw) - } + if raw < 0 { None } else { Some(raw) } } /** @@ -179,11 +175,7 @@ impl PQResult { pub fn field_size(&self, column: usize) -> Option { let raw = unsafe { pq_sys::PQfsize(self.into(), column as i32) }; - if raw < 0 { - None - } else { - Some(raw as usize) - } + if raw < 0 { None } else { Some(raw as usize) } } /**