diff --git a/src/ffi/bindgen.rs b/src/ffi/bindgen.rs index a108568..04c4779 100644 --- a/src/ffi/bindgen.rs +++ b/src/ffi/bindgen.rs @@ -2,7 +2,7 @@ /* Running `target/bindgen /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/sqlite3.h -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/6.0/include` */ /* automatically generated by rust-bindgen */ -#[deriving(Copy)] +#[derive(Copy)] pub enum Struct_sqlite3 { } pub type sqlite3 = Struct_sqlite3; pub type sqlite_int64 = ::libc::c_longlong; @@ -17,13 +17,13 @@ pub type sqlite3_callback = -> ::libc::c_int>; pub type sqlite3_file = Struct_sqlite3_file; #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_file { pub pMethods: *const Struct_sqlite3_io_methods, } pub type sqlite3_io_methods = Struct_sqlite3_io_methods; #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_io_methods { pub iVersion: ::libc::c_int, pub xClose: ::std::option::Option ::libc::c_int>, } -#[deriving(Copy)] +#[derive(Copy)] pub enum Struct_sqlite3_mutex { } pub type sqlite3_mutex = Struct_sqlite3_mutex; pub type sqlite3_vfs = Struct_sqlite3_vfs; pub type sqlite3_syscall_ptr = ::std::option::Option; #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_vfs { pub iVersion: ::libc::c_int, pub szOsFile: ::libc::c_int, @@ -197,7 +197,7 @@ pub struct Struct_sqlite3_vfs { } pub type sqlite3_mem_methods = Struct_sqlite3_mem_methods; #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_mem_methods { pub xMalloc: ::std::option::Option *mut ::libc::c_void>, @@ -217,13 +217,13 @@ pub struct Struct_sqlite3_mem_methods { (arg1: *mut ::libc::c_void)>, pub pAppData: *mut ::libc::c_void, } -#[deriving(Copy)] +#[derive(Copy)] pub enum Struct_sqlite3_stmt { } pub type sqlite3_stmt = Struct_sqlite3_stmt; -#[deriving(Copy)] +#[derive(Copy)] pub enum Struct_Mem { } pub type sqlite3_value = Struct_Mem; -#[deriving(Copy)] +#[derive(Copy)] pub enum Struct_sqlite3_context { } pub type sqlite3_context = Struct_sqlite3_context; pub type sqlite3_destructor_type = @@ -233,7 +233,7 @@ pub type sqlite3_index_info = Struct_sqlite3_index_info; pub type sqlite3_vtab_cursor = Struct_sqlite3_vtab_cursor; pub type sqlite3_module = Struct_sqlite3_module; #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_module { pub iVersion: ::libc::c_int, pub xCreate: ::std::option::Option ::libc::c_int>, } #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_index_info { pub nConstraint: ::libc::c_int, pub aConstraint: *mut Struct_sqlite3_index_constraint, @@ -357,7 +357,7 @@ pub struct Struct_sqlite3_index_info { pub estimatedCost: ::libc::c_double, } #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_index_constraint { pub iColumn: ::libc::c_int, pub op: ::libc::c_uchar, @@ -365,35 +365,35 @@ pub struct Struct_sqlite3_index_constraint { pub iTermOffset: ::libc::c_int, } #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_index_orderby { pub iColumn: ::libc::c_int, pub desc: ::libc::c_uchar, } #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_index_constraint_usage { pub argvIndex: ::libc::c_int, pub omit: ::libc::c_uchar, } #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_vtab { pub pModule: *const sqlite3_module, pub nRef: ::libc::c_int, pub zErrMsg: *mut ::libc::c_char, } #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_vtab_cursor { pub pVtab: *mut sqlite3_vtab, } -#[deriving(Copy)] +#[derive(Copy)] pub enum Struct_sqlite3_blob { } pub type sqlite3_blob = Struct_sqlite3_blob; pub type sqlite3_mutex_methods = Struct_sqlite3_mutex_methods; #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_mutex_methods { pub xMutexInit: ::std::option::Option ::libc::c_int>, pub xMutexEnd: ::std::option::Option ::libc::c_int>, @@ -415,19 +415,19 @@ pub struct Struct_sqlite3_mutex_methods { (arg1: *mut sqlite3_mutex) -> ::libc::c_int>, } -#[deriving(Copy)] +#[derive(Copy)] pub enum Struct_sqlite3_pcache { } pub type sqlite3_pcache = Struct_sqlite3_pcache; pub type sqlite3_pcache_page = Struct_sqlite3_pcache_page; #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_pcache_page { pub pBuf: *mut ::libc::c_void, pub pExtra: *mut ::libc::c_void, } pub type sqlite3_pcache_methods2 = Struct_sqlite3_pcache_methods2; #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_pcache_methods2 { pub iVersion: ::libc::c_int, pub pArg: *mut ::libc::c_void, @@ -470,7 +470,7 @@ pub struct Struct_sqlite3_pcache_methods2 { } pub type sqlite3_pcache_methods = Struct_sqlite3_pcache_methods; #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_pcache_methods { pub pArg: *mut ::libc::c_void, pub xInit: ::std::option::Option, } -#[deriving(Copy)] +#[derive(Copy)] pub enum Struct_sqlite3_backup { } pub type sqlite3_backup = Struct_sqlite3_backup; pub type sqlite3_rtree_geometry = Struct_sqlite3_rtree_geometry; #[repr(C)] -#[deriving(Copy)] +#[derive(Copy)] pub struct Struct_sqlite3_rtree_geometry { pub pContext: *mut ::libc::c_void, pub nParam: ::libc::c_int, diff --git a/src/lib.rs b/src/lib.rs index c263f2a..0d358f3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,7 +8,7 @@ //! use time::Timespec; //! use rusqlite::SqliteConnection; //! -//! #[deriving(Show)] +//! #[derive(Show)] //! struct Person { //! id: i32, //! name: String, @@ -84,7 +84,7 @@ unsafe fn errmsg_to_string(errmsg: *const c_char) -> String { } /// Encompasses an error result from a call to the SQLite C API. -#[deriving(Show)] +#[derive(Show)] pub struct SqliteError { /// The error code returned by a SQLite C API call. See [SQLite Result /// Codes](http://www.sqlite.org/rescode.html) for details. diff --git a/src/transaction.rs b/src/transaction.rs index 5df9a6e..27f20df 100644 --- a/src/transaction.rs +++ b/src/transaction.rs @@ -7,7 +7,7 @@ pub use SqliteTransactionBehavior::{ /// Options for transaction behavior. See [BEGIN /// TRANSACTION](http://www.sqlite.org/lang_transaction.html) for details. -#[deriving(Copy)] +#[derive(Copy)] pub enum SqliteTransactionBehavior { SqliteTransactionDeferred, SqliteTransactionImmediate, diff --git a/src/types.rs b/src/types.rs index 4be05f0..9f91804 100644 --- a/src/types.rs +++ b/src/types.rs @@ -141,7 +141,7 @@ impl ToSql for Option { /// conn.execute("INSERT INTO people (name) VALUES (?)", &[&Null]) /// } /// ``` -#[deriving(Copy)] +#[derive(Copy)] pub struct Null; impl ToSql for Null {