Remove silent unwrap in data providers
This commit is contained in:
1 parent
01f0999772
commit
de2dbaf6c1
6 files changed
+47
-64
No files matched your search
@@ -3,7 +3,7 @@ use rusqlite::{params, Connection};
|
||||
use std::collections::HashMap;
|
||||
|
||||
pub fn add_word(word: &mut WordData, connection: &Connection) {
|
||||
let index = connection
|
||||
let index : u32 = connection
|
||||
.query_row(
|
||||
"INSERT INTO words (key, value, tags, more, group_id) VALUES (?1, ?2, ?3, ?4, ?5) RETURNING id",
|
||||
(
|
||||
@@ -14,11 +14,7 @@ pub fn add_word(word: &mut WordData, connection: &Connection) {
|
||||
&word.group_id,
|
||||
),
|
||||
|row| row.get(0),
|
||||
)
|
||||
.unwrap_or_else(|e| {
|
||||
println!("{}", e);
|
||||
0
|
||||
});
|
||||
).unwrap();
|
||||
|
||||
word.id = index.into();
|
||||
}
|
||||
@@ -72,10 +68,7 @@ pub fn update_word(word: &mut WordData, connection: &Connection) {
|
||||
&word.id,
|
||||
),
|
||||
)
|
||||
.unwrap_or_else(|e| {
|
||||
println!("{}", e);
|
||||
0
|
||||
});
|
||||
.unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -85,10 +78,7 @@ pub fn delete_word(word: &WordData, connection: &Connection) {
|
||||
}
|
||||
connection
|
||||
.execute("DELETE FROM words WHERE id = ?1", (&word.id,))
|
||||
.unwrap_or_else(|e| {
|
||||
println!("{}", e);
|
||||
0
|
||||
});
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
pub fn load_words(connection: &Connection) -> Vec<WordData> {
|
||||
@@ -139,16 +129,13 @@ pub fn load_word_groups(connection: &Connection) -> Vec<WordGroup> {
|
||||
}
|
||||
|
||||
pub fn add_group(group: &mut WordGroup, connection: &Connection) {
|
||||
let index = connection
|
||||
let index : u32 = connection
|
||||
.query_row(
|
||||
"INSERT INTO word_group (name) VALUES (?1) RETURNING id",
|
||||
(&group.name,),
|
||||
|row| row.get(0),
|
||||
)
|
||||
.unwrap_or_else(|e| {
|
||||
println!("{}", e);
|
||||
0
|
||||
});
|
||||
.unwrap();
|
||||
|
||||
group.id = index.into();
|
||||
}
|
||||
@@ -162,10 +149,7 @@ pub fn update_group(group: &mut WordGroup, connection: &Connection) {
|
||||
"UPDATE word_group SET name = ?1 WHERE id = ?2",
|
||||
(&group.name, &group.id),
|
||||
)
|
||||
.unwrap_or_else(|e| {
|
||||
println!("{}", e);
|
||||
0
|
||||
});
|
||||
.unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -175,8 +159,5 @@ pub fn delete_group(group: &WordGroup, connection: &Connection) {
|
||||
}
|
||||
connection
|
||||
.execute("DELETE FROM word_group WHERE id = ?1", (&group.id,))
|
||||
.unwrap_or_else(|e| {
|
||||
println!("{}", e);
|
||||
0
|
||||
});
|
||||
.unwrap();
|
||||
}
|
||||
Reference in new issue
Block a user