From faa94d124695988bb6152a55882bfd56ef237bc6 Mon Sep 17 00:00:00 2001 From: gwenn Date: Fri, 24 Feb 2017 20:10:51 +0100 Subject: [PATCH] Fix clippy warnings And fix bench. --- benches/lib.rs | 5 ++--- src/functions.rs | 8 ++++---- src/lib.rs | 13 ++++++++----- src/types/chrono.rs | 5 ++--- src/types/serde_json.rs | 4 ++-- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/benches/lib.rs b/benches/lib.rs index 92fddef..fb03d09 100644 --- a/benches/lib.rs +++ b/benches/lib.rs @@ -4,12 +4,12 @@ extern crate test; extern crate rusqlite; use rusqlite::Connection; -use rusqlite::cache::StatementCache; use test::Bencher; #[bench] fn bench_no_cache(b: &mut Bencher) { let db = Connection::open_in_memory().unwrap(); + db.set_prepared_statement_cache_capacity(0); let sql = "SELECT 1, 'test', 3.14 UNION SELECT 2, 'exp', 2.71"; b.iter(|| db.prepare(sql).unwrap()); } @@ -17,7 +17,6 @@ fn bench_no_cache(b: &mut Bencher) { #[bench] fn bench_cache(b: &mut Bencher) { let db = Connection::open_in_memory().unwrap(); - let cache = StatementCache::new(&db, 15); let sql = "SELECT 1, 'test', 3.14 UNION SELECT 2, 'exp', 2.71"; - b.iter(|| cache.get(sql).unwrap()); + b.iter(|| db.prepare_cached(sql).unwrap()); } diff --git a/src/functions.rs b/src/functions.rs index fb39ca3..caa2720 100644 --- a/src/functions.rs +++ b/src/functions.rs @@ -79,7 +79,7 @@ fn set_result<'a>(ctx: *mut sqlite3_context, result: &ToSqlOutput<'a>) { ValueRef::Null => unsafe { ffi::sqlite3_result_null(ctx) }, ValueRef::Integer(i) => unsafe { ffi::sqlite3_result_int64(ctx, i) }, ValueRef::Real(r) => unsafe { ffi::sqlite3_result_double(ctx, r) }, - ValueRef::Text(ref s) => unsafe { + ValueRef::Text(s) => unsafe { let length = s.len(); if length > ::std::i32::MAX as usize { ffi::sqlite3_result_error_toobig(ctx); @@ -97,7 +97,7 @@ fn set_result<'a>(ctx: *mut sqlite3_context, result: &ToSqlOutput<'a>) { ffi::sqlite3_result_text(ctx, c_str.as_ptr(), length as c_int, destructor); } }, - ValueRef::Blob(ref b) => unsafe { + ValueRef::Blob(b) => unsafe { let length = b.len(); if length > ::std::i32::MAX as usize { ffi::sqlite3_result_error_toobig(ctx); @@ -114,8 +114,8 @@ fn set_result<'a>(ctx: *mut sqlite3_context, result: &ToSqlOutput<'a>) { } unsafe fn report_error(ctx: *mut sqlite3_context, err: &Error) { - match err { - &Error::SqliteFailure(ref err, ref s) => { + match *err { + Error::SqliteFailure(ref err, ref s) => { ffi::sqlite3_result_error_code(ctx, err.extended_code); if let Some(Ok(cstr)) = s.as_ref().map(|s| str_to_cstring(s)) { ffi::sqlite3_result_error(ctx, cstr.as_ptr(), -1); diff --git a/src/lib.rs b/src/lib.rs index 9edfa1c..87c752f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -596,7 +596,8 @@ fn ensure_valid_sqlite_version() { let runtime_major = version_number / 1_000_000; if buildtime_major != runtime_major { panic!("rusqlite was built against SQLite {} but is running with SQLite {}", - str::from_utf8(ffi::SQLITE_VERSION).unwrap(), version()); + str::from_utf8(ffi::SQLITE_VERSION).unwrap(), + version()); } if BYPASS_VERSION_CHECK.load(Ordering::Relaxed) { @@ -611,7 +612,9 @@ rusqlite was built against SQLite {} but the runtime SQLite version is {}. To fi * Recompile rusqlite and link against the SQLite version you are using at runtime, or * Call rusqlite::bypass_sqlite_version_check() prior to your first connection attempt. Doing this means you're sure everything will work correctly even though the runtime version is older than - the version we found at build time.", str::from_utf8(ffi::SQLITE_VERSION).unwrap(), version()); + the version we found at build time.", + str::from_utf8(ffi::SQLITE_VERSION).unwrap(), + version()); } }); } @@ -683,9 +686,9 @@ impl InnerConnection { // Replicate the check for sane open flags from SQLite, because the check in SQLite itself // wasn't added until version 3.7.3. - debug_assert!(1 << SQLITE_OPEN_READ_ONLY.bits == 0x02); - debug_assert!(1 << SQLITE_OPEN_READ_WRITE.bits == 0x04); - debug_assert!(1 << (SQLITE_OPEN_READ_WRITE|SQLITE_OPEN_CREATE).bits == 0x40); + debug_assert!(1 << SQLITE_OPEN_READ_ONLY.bits == 0x02); + debug_assert!(1 << SQLITE_OPEN_READ_WRITE.bits == 0x04); + debug_assert!(1 << (SQLITE_OPEN_READ_WRITE | SQLITE_OPEN_CREATE).bits == 0x40); if (1 << (flags.bits & 0x7)) & 0x46 == 0 { return Err(Error::SqliteFailure(ffi::Error::new(ffi::SQLITE_MISUSE), None)); } diff --git a/src/types/chrono.rs b/src/types/chrono.rs index 1503726..29993a1 100644 --- a/src/types/chrono.rs +++ b/src/types/chrono.rs @@ -104,9 +104,8 @@ impl FromSql for DateTime { Cow::Borrowed(s) }; - match DateTime::parse_from_rfc3339(&s) { - Ok(dt) => return Ok(dt.with_timezone(&UTC)), - Err(_) => (), + if let Ok(dt) = DateTime::parse_from_rfc3339(&s) { + return Ok(dt.with_timezone(&UTC)); } } diff --git a/src/types/serde_json.rs b/src/types/serde_json.rs index c710a81..5f236dc 100644 --- a/src/types/serde_json.rs +++ b/src/types/serde_json.rs @@ -17,8 +17,8 @@ impl ToSql for Value { impl FromSql for Value { fn column_result(value: ValueRef) -> FromSqlResult { match value { - ValueRef::Text(ref s) => serde_json::from_str(s), - ValueRef::Blob(ref b) => serde_json::from_slice(b), + ValueRef::Text(s) => serde_json::from_str(s), + ValueRef::Blob(b) => serde_json::from_slice(b), _ => return Err(FromSqlError::InvalidType), } .map_err(|err| FromSqlError::Other(Box::new(err)))