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

Fix clippy warnings

Browse Source
This commit is contained in:
gwenn 2016-04-02 17:16:17 +02:00
parent b802230d56
commit 59872a1850
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/vtab/csvtab.rs
View File

@ -2,7 +2,6 @@
extern crate csv; extern crate csv;
use std::ffi::CStr; use std::ffi::CStr;
use std::fs::File; use std::fs::File;
use std::mem;
use std::path::Path; use std::path::Path;
use std::result; use std::result;
use std::str; use std::str;
@ -52,7 +51,7 @@ impl VTab<CSVTabCursor> for CSVTab {
args: &[*const libc::c_char]) args: &[*const libc::c_char])
-> Result<CSVTab> { -> Result<CSVTab> {
if args.len() < 4 { if args.len() < 4 {
return Err(Error::ModuleError(format!("no CSV file specified"))); return Err(Error::ModuleError("no CSV file specified".to_owned()));
} }
// pull out name of csv file (remove quotes) // pull out name of csv file (remove quotes)
let mut c_filename = unsafe { CStr::from_ptr(args[3]).to_bytes() }; let mut c_filename = unsafe { CStr::from_ptr(args[3]).to_bytes() };
@ -104,13 +103,13 @@ impl VTab<CSVTabCursor> for CSVTab {
} }
if cols.is_empty() { if cols.is_empty() {
return Err(Error::ModuleError(format!("no column name specified"))); return Err(Error::ModuleError("no column name specified".to_owned()));
} }
let mut sql = String::from("CREATE TABLE x("); let mut sql = String::from("CREATE TABLE x(");
for (i, col) in cols.iter().enumerate() { for (i, col) in cols.iter().enumerate() {
if col.is_empty() { if col.is_empty() {
return Err(Error::ModuleError(format!("no column name found"))); return Err(Error::ModuleError("no column name found".to_owned()));
} }
sql.push('"'); sql.push('"');
sql.push_str(col); sql.push_str(col);

1
src/vtab/int_array.rs
View File

@ -63,6 +63,7 @@ impl VTab<IntArrayVTabCursor> for IntArrayVTab {
} }
} }
#[derive(Default)]
#[repr(C)] #[repr(C)]
struct IntArrayVTabCursor { struct IntArrayVTabCursor {
/// Base class /// Base class

6
src/vtab/mod.rs
View File

@ -130,7 +130,7 @@ pub fn declare_vtab(db: *mut ffi::sqlite3, sql: &str) -> Result<()> {
} }
/// Escape double-quote (`"`) character occurences by doubling them (`""`). /// Escape double-quote (`"`) character occurences by doubling them (`""`).
pub fn escape_double_quote<'a>(identifier: &'a str) -> Cow<'a, str> { pub fn escape_double_quote(identifier: &str) -> Cow<str> {
if identifier.contains('"') { if identifier.contains('"') {
// escape quote by doubling them // escape quote by doubling them
Owned(identifier.replace("\"", "\"\"")) Owned(identifier.replace("\"", "\"\""))
@ -216,7 +216,7 @@ unsafe extern "C" fn $best_index(vtab: *mut ffi::sqlite3_vtab,
} }
unsafe extern "C" fn $destroy(vtab: *mut ffi::sqlite3_vtab) -> libc::c_int { unsafe extern "C" fn $destroy(vtab: *mut ffi::sqlite3_vtab) -> libc::c_int {
let vtab = vtab as *mut $vtab; let vtab = vtab as *mut $vtab;
let _: Box<$vtab> = Box::from_raw(mem::transmute(vtab)); let _: Box<$vtab> = Box::from_raw(vtab);
ffi::SQLITE_OK ffi::SQLITE_OK
} }
@ -246,7 +246,7 @@ unsafe extern "C" fn $open(vtab: *mut ffi::sqlite3_vtab,
} }
unsafe extern "C" fn $close(cursor: *mut ffi::sqlite3_vtab_cursor) -> libc::c_int { unsafe extern "C" fn $close(cursor: *mut ffi::sqlite3_vtab_cursor) -> libc::c_int {
let cr = cursor as *mut $cursor; let cr = cursor as *mut $cursor;
let _: Box<$cursor> = Box::from_raw(mem::transmute(cr)); let _: Box<$cursor> = Box::from_raw(cr);
ffi::SQLITE_OK ffi::SQLITE_OK
} }