Skip to content

Commit

Permalink
cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
sanpii committed Feb 20, 2025
1 parent 376745c commit 07b2125
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 41 deletions.
4 changes: 3 additions & 1 deletion codegen/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down
6 changes: 1 addition & 5 deletions src/ffi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@ pub(crate) fn to_option_str(s: *const c_char) -> crate::errors::Result<Option<&'

let s = to_str(s)?;

if s.is_empty() {
Ok(None)
} else {
Ok(Some(s))
}
if s.is_empty() { Ok(None) } else { Ok(Some(s)) }
}

pub(crate) fn to_option_string(s: *const c_char) -> crate::errors::Result<Option<String>> {
Expand Down
30 changes: 5 additions & 25 deletions src/pipeline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() }
}

/**
Expand All @@ -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() }
}

/**
Expand All @@ -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() }
}

/**
Expand All @@ -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() }
}

/**
Expand All @@ -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)]
Expand Down
12 changes: 2 additions & 10 deletions src/result/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,7 @@ impl PQResult {
pub fn field_mod(&self, column: usize) -> Option<i32> {
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) }
}

/**
Expand All @@ -179,11 +175,7 @@ impl PQResult {
pub fn field_size(&self, column: usize) -> Option<usize> {
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) }
}

/**
Expand Down

0 comments on commit 07b2125

Please sign in to comment.