rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-08 05:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix clippy warnings in postgres_ffi/build.rs (#2081)

Browse Source
This commit is contained in:
Alexander Bayandin
2022-07-13 14:12:11 +01:00
committed by GitHub
parent 2b21d7b5bc
commit 07acd6ddde
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/postgres_ffi/build.rs
View File

@@ -50,8 +50,6 @@ fn main() {
// - if POSTGRES_INSTALL_DIR is set look into it, otherwise look into `<project_root>/tmp_install`
// - if there's a `bin/pg_config` file use it for getting include server, otherwise use `<project_root>/tmp_install/include/postgresql/server`
let mut pg_install_dir: PathBuf;
let inc_server_path: String;
if let Some(postgres_install_dir) = env::var_os("POSTGRES_INSTALL_DIR") {
pg_install_dir = postgres_install_dir.into();
} else {
@@ -64,7 +62,7 @@ fn main() {
}
let pg_config_bin = pg_install_dir.join("bin").join("pg_config");
if pg_config_bin.exists() {
let inc_server_path: String = if pg_config_bin.exists() {
let output = Command::new(pg_config_bin)
.arg("--includedir-server")
.output()
@@ -74,16 +72,16 @@ fn main() {
panic!("`pg_config --includedir-server` failed")
}
inc_server_path = String::from_utf8(output.stdout).unwrap().trim_end().into();
String::from_utf8(output.stdout).unwrap().trim_end().into()
} else {
inc_server_path = pg_install_dir
pg_install_dir
.join("include")
.join("postgresql")
.join("server")
.into_os_string()
.into_string()
.unwrap();
}
.unwrap()
};
// The bindgen::Builder is the main entry point
// to bindgen, and lets you build up options for