Rust 2018 idioms

This commit is contained in:
gwenn
2018-12-07 21:57:04 +01:00
parent 92020d54b7
commit d874180333
27 changed files with 142 additions and 146 deletions

View File

@@ -5,7 +5,6 @@
#[cfg(feature = "trace")]
#[macro_use]
extern crate lazy_static;
extern crate rusqlite;
#[cfg(feature = "trace")]
fn main() {

View File

@@ -1,8 +1,7 @@
//! Ensure we reject connections when SQLite is in single-threaded mode, as it
//! would violate safety if multiple Rust threads tried to use connections.
extern crate libsqlite3_sys as ffi;
extern crate rusqlite;
use libsqlite3_sys as ffi;
use rusqlite::Connection;

View File

@@ -1,8 +1,5 @@
//! Ensure Virtual tables can be declared outside `rusqlite` crate.
#[cfg(feature = "vtab")]
extern crate rusqlite;
#[cfg(feature = "vtab")]
#[test]
fn test_dummy_module() {
@@ -61,7 +58,7 @@ fn test_dummy_module() {
&mut self,
_idx_num: c_int,
_idx_str: Option<&str>,
_args: &Values,
_args: &Values<'_>,
) -> Result<()> {
self.row_id = 1;
Ok(())
@@ -98,7 +95,7 @@ fn test_dummy_module() {
let mut s = db.prepare("SELECT * FROM dummy()").unwrap();
let dummy = s
.query_row(&[] as &[&ToSql], |row| row.get::<_, i32>(0))
.query_row(&[] as &[&dyn ToSql], |row| row.get::<_, i32>(0))
.unwrap();
assert_eq!(1, dummy);
}