diff --git a/src/functions.rs b/src/functions.rs index e8065a5..2ae29a8 100644 --- a/src/functions.rs +++ b/src/functions.rs @@ -820,9 +820,9 @@ mod test { FunctionFlags::SQLITE_UTF8 | FunctionFlags::SQLITE_DETERMINISTIC, half, )?; - let result: Result = db.one_column("SELECT half(6)"); + let result: f64 = db.one_column("SELECT half(6)")?; - assert!((3f64 - result?).abs() < f64::EPSILON); + assert!((3f64 - result).abs() < f64::EPSILON); Ok(()) } @@ -835,8 +835,8 @@ mod test { FunctionFlags::SQLITE_UTF8 | FunctionFlags::SQLITE_DETERMINISTIC, half, )?; - let result: Result = db.one_column("SELECT half(6)"); - assert!((3f64 - result?).abs() < f64::EPSILON); + let result: f64 = db.one_column("SELECT half(6)")?; + assert!((3f64 - result).abs() < f64::EPSILON); db.remove_function("half", 1)?; let result: Result = db.one_column("SELECT half(6)"); @@ -885,14 +885,14 @@ mod test { regexp_with_auxilliary, )?; - let result: Result = db.one_column("SELECT regexp('l.s[aeiouy]', 'lisa')"); + let result: bool = db.one_column("SELECT regexp('l.s[aeiouy]', 'lisa')")?; - assert!(result?); + assert!(result); - let result: Result = - db.one_column("SELECT COUNT(*) FROM foo WHERE regexp('l.s[aeiouy]', x) == 1"); + let result: i64 = + db.one_column("SELECT COUNT(*) FROM foo WHERE regexp('l.s[aeiouy]', x) == 1")?; - assert_eq!(2, result?); + assert_eq!(2, result); Ok(()) } diff --git a/src/lib.rs b/src/lib.rs index 439a450..da07327 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1267,9 +1267,9 @@ mod test { let path_string = path.to_str().unwrap(); let db = Connection::open(path_string)?; - let the_answer: Result = db.one_column("SELECT x FROM foo"); + let the_answer: i64 = db.one_column("SELECT x FROM foo")?; - assert_eq!(42i64, the_answer?); + assert_eq!(42i64, the_answer); Ok(()) } @@ -1324,9 +1324,9 @@ mod test { } let db = Connection::open(&db_path)?; - let the_answer: Result = db.one_column("SELECT x FROM foo"); + let the_answer: i64 = db.one_column("SELECT x FROM foo")?; - assert_eq!(42i64, the_answer?); + assert_eq!(42i64, the_answer); Ok(()) } diff --git a/src/unlock_notify.rs b/src/unlock_notify.rs index bb927aa..065c52d 100644 --- a/src/unlock_notify.rs +++ b/src/unlock_notify.rs @@ -109,8 +109,8 @@ mod test { tx2.commit().unwrap(); }); assert_eq!(tx.recv().unwrap(), 1); - let the_answer: Result = db1.one_column("SELECT x FROM foo"); - assert_eq!(42i64, the_answer?); + let the_answer: i64 = db1.one_column("SELECT x FROM foo")?; + assert_eq!(42i64, the_answer); child.join().unwrap(); Ok(()) }