ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2024-11-23 09:09:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #602 from gwenn/clippy

Browse Source 
Fix some Clippy warnings
This commit is contained in:
gwenn 2019-12-19 20:19:35 +01:00 committed by GitHub
commit ff2a5a5588
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libsqlite3-sys/build.rs
View File

@ -138,10 +138,12 @@ impl From<HeaderLocation> for String {
match header { match header {
HeaderLocation::FromEnvironment => { HeaderLocation::FromEnvironment => {
let prefix = env_prefix(); let prefix = env_prefix();
let mut header = env::var(format!("{}_INCLUDE_DIR", prefix)).expect(&format!( let mut header = env::var(format!("{}_INCLUDE_DIR", prefix)).unwrap_or_else(|_| {
panic!(
"{}_INCLUDE_DIR must be set if {}_LIB_DIR is set", "{}_INCLUDE_DIR must be set if {}_LIB_DIR is set",
prefix, prefix prefix, prefix
)); )
});
header.push_str("/sqlite3.h"); header.push_str("/sqlite3.h");
header header
} }
@ -209,7 +211,7 @@ mod build_linked {
// Try to use pkg-config to determine link commands // Try to use pkg-config to determine link commands
let pkgconfig_path = Path::new(&dir).join("pkgconfig"); let pkgconfig_path = Path::new(&dir).join("pkgconfig");
env::set_var("PKG_CONFIG_PATH", pkgconfig_path); env::set_var("PKG_CONFIG_PATH", pkgconfig_path);
if let Err(_) = pkg_config::Config::new().probe(link_lib) { if pkg_config::Config::new().probe(link_lib).is_err() {
// Otherwise just emit the bare minimum link commands. // Otherwise just emit the bare minimum link commands.
println!("cargo:rustc-link-lib={}={}", find_link_mode(), link_lib); println!("cargo:rustc-link-lib={}={}", find_link_mode(), link_lib);
println!("cargo:rustc-link-search={}", dir); println!("cargo:rustc-link-search={}", dir);
@ -338,7 +340,7 @@ mod bindings {
bindings bindings
.generate() .generate()
.expect(&format!("could not run bindgen on header {}", header)) .unwrap_or_else(|_| panic!("could not run bindgen on header {}", header))
.write(Box::new(&mut output)) .write(Box::new(&mut output))
.expect("could not write output of bindgen"); .expect("could not write output of bindgen");
let mut output = String::from_utf8(output).expect("bindgen output was not UTF-8?!"); let mut output = String::from_utf8(output).expect("bindgen output was not UTF-8?!");
@ -357,10 +359,10 @@ mod bindings {
.write(true) .write(true)
.truncate(true) .truncate(true)
.create(true) .create(true)
.open(out_path.clone()) .open(out_path)
.expect(&format!("Could not write to {:?}", out_path)); .unwrap_or_else(|_| panic!("Could not write to {:?}", out_path));
file.write_all(output.as_bytes()) file.write_all(output.as_bytes())
.expect(&format!("Could not write to {:?}", out_path)); .unwrap_or_else(|_| panic!("Could not write to {:?}", out_path));
} }
} }

6
libsqlite3-sys/src/lib.rs
View File

@ -49,7 +49,11 @@ pub enum Limit {
SQLITE_LIMIT_WORKER_THREADS = 11, SQLITE_LIMIT_WORKER_THREADS = 11,
} }
include!(concat!(env!("OUT_DIR"), "/bindgen.rs")); #[allow(clippy::all)]
mod bindings {
include!(concat!(env!("OUT_DIR"), "/bindgen.rs"));
}
pub use bindings::*;
pub type sqlite3_index_constraint = sqlite3_index_info_sqlite3_index_constraint; pub type sqlite3_index_constraint = sqlite3_index_info_sqlite3_index_constraint;
pub type sqlite3_index_constraint_usage = sqlite3_index_info_sqlite3_index_constraint_usage; pub type sqlite3_index_constraint_usage = sqlite3_index_info_sqlite3_index_constraint_usage;