From bbfedbb82e7c48308fdcb7047a50ff59a6ee7157 Mon Sep 17 00:00:00 2001 From: Marcus Klaas Date: Wed, 3 Dec 2014 17:14:49 +0100 Subject: [PATCH] fix small error in README; update deprecated method call --- README.md | 6 +++--- src/types.rs | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 98339ae..10319a0 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ fn main() { name TEXT NOT NULL, time_created TEXT NOT NULL, data BLOB - )", []).unwrap(); + )", &[]).unwrap(); let me = Person { id: 0, name: "Steven".to_string(), @@ -41,7 +41,7 @@ fn main() { &[&me.name, &me.time_created, &me.data]).unwrap(); let mut stmt = conn.prepare("SELECT id, name, time_created, data FROM person").unwrap(); - for row in stmt.query([]).unwrap().map(|row| row.unwrap()) { + for row in stmt.query(&[]).unwrap().map(|row| row.unwrap()) { let person = Person { id: row.get(0), name: row.get(1), @@ -71,7 +71,7 @@ will panic if you do so. A specific example that will panic: ```rust fn bad_function_will_panic(conn: &SqliteConnection) -> SqliteResult { let mut stmt = try!(conn.prepare("SELECT id FROM my_table")); - let mut rows = try!(stmt.query([])); + let mut rows = try!(stmt.query(&[])); let row0 = try!(rows.next().unwrap()); // row 0 is valid now... diff --git a/src/types.rs b/src/types.rs index 2f07953..41617fe 100644 --- a/src/types.rs +++ b/src/types.rs @@ -57,7 +57,6 @@ extern crate time; use libc::{c_int, c_double}; use std::c_str::{CString}; use std::mem; -use std::vec; use super::ffi; use super::{SqliteResult, SqliteError}; @@ -186,7 +185,7 @@ impl FromSql for Vec { assert!(len >= 0); let len = len as uint; - Ok(vec::raw::from_buf(mem::transmute(c_blob), len)) + Ok(Vec::from_raw_buf(mem::transmute(c_blob), len)) } }