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 #16 from pfernie/rustup-20150203

Browse Source 
Rustup 20150203
This commit is contained in:
John Gallagher 2015-02-04 10:46:09 -05:00
commit 0f349ab019
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -13,7 +13,7 @@ extern crate time;
use time::Timespec; use time::Timespec;
use rusqlite::SqliteConnection; use rusqlite::SqliteConnection;
#[derive(Show)] #[derive(Debug)]
struct Person { struct Person {
id: i32, id: i32,
name: String, name: String,

13
src/lib.rs
View File

@ -9,7 +9,7 @@
//! use time::Timespec; //! use time::Timespec;
//! use rusqlite::SqliteConnection; //! use rusqlite::SqliteConnection;
//! //!
//! #[derive(Show)] //! #[derive(Debug)]
//! struct Person { //! struct Person {
//! id: i32, //! id: i32,
//! name: String, //! name: String,
@ -48,8 +48,7 @@
//! } //! }
//! } //! }
//! ``` //! ```
#![feature(unsafe_destructor)] #![feature(unsafe_destructor, core, std_misc, libc, rustc_private, collections, hash)]
#![allow(unstable)]
extern crate libc; extern crate libc;
#[macro_use] extern crate rustc_bitflags; #[macro_use] extern crate rustc_bitflags;
@ -88,7 +87,7 @@ unsafe fn errmsg_to_string(errmsg: *const c_char) -> String {
} }
/// Encompasses an error result from a call to the SQLite C API. /// Encompasses an error result from a call to the SQLite C API.
#[derive(Show)] #[derive(Debug)]
pub struct SqliteError { pub struct SqliteError {
/// The error code returned by a SQLite C API call. See [SQLite Result /// The error code returned by a SQLite C API call. See [SQLite Result
/// Codes](http://www.sqlite.org/rescode.html) for details. /// Codes](http://www.sqlite.org/rescode.html) for details.
@ -99,7 +98,7 @@ pub struct SqliteError {
pub message: String, pub message: String,
} }
impl fmt::String for SqliteError { impl fmt::Display for SqliteError {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
write!(f, "SqliteError( code: {}, message: {} )", self.code, self.message) write!(f, "SqliteError( code: {}, message: {} )", self.code, self.message)
} }
@ -323,7 +322,7 @@ impl SqliteConnection {
} }
} }
impl fmt::Show for SqliteConnection { impl fmt::Debug for SqliteConnection {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "SqliteConnection()") write!(f, "SqliteConnection()")
} }
@ -547,7 +546,7 @@ impl<'conn> SqliteStatement<'conn> {
} }
} }
impl<'conn> fmt::Show for SqliteStatement<'conn> { impl<'conn> fmt::Debug for SqliteStatement<'conn> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "Statement( conn: {:?}, stmt: {:?} )", self.conn, self.stmt) write!(f, "Statement( conn: {:?}, stmt: {:?} )", self.conn, self.stmt)
} }