From 68888f6d1f7a1fe83325896534c39744ea1921f8 Mon Sep 17 00:00:00 2001
From: Floris Bruynooghe <flub@google.com>
Date: Sun, 21 Jul 2019 12:03:04 +0200
Subject: [PATCH] Also silence warnings in test code

We can be a bit more liberal with .unwrap() here.
---
 examples/repl/cmdline.rs | 27 +++++++++++++++++----------
 examples/simple.rs       |  5 +++--
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/examples/repl/cmdline.rs b/examples/repl/cmdline.rs
index 3138be865..06f8d2f74 100644
--- a/examples/repl/cmdline.rs
+++ b/examples/repl/cmdline.rs
@@ -28,7 +28,7 @@ use num_traits::FromPrimitive;
 pub unsafe fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
     info!(context, 0, "Resetting tables ({})...", bits);
     if 0 != bits & 1 {
-        sql::execute(context, &context.sql, "DELETE FROM jobs;", params![]);
+        sql::execute(context, &context.sql, "DELETE FROM jobs;", params![]).unwrap();
         info!(context, 0, "(1) Jobs reset.");
     }
     if 0 != bits & 2 {
@@ -37,11 +37,12 @@ pub unsafe fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
             &context.sql,
             "DELETE FROM acpeerstates;",
             params![],
-        );
+        )
+        .unwrap();
         info!(context, 0, "(2) Peerstates reset.");
     }
     if 0 != bits & 4 {
-        sql::execute(context, &context.sql, "DELETE FROM keypairs;", params![]);
+        sql::execute(context, &context.sql, "DELETE FROM keypairs;", params![]).unwrap();
         info!(context, 0, "(4) Private keypairs reset.");
     }
     if 0 != bits & 8 {
@@ -50,32 +51,37 @@ pub unsafe fn dc_reset_tables(context: &Context, bits: i32) -> i32 {
             &context.sql,
             "DELETE FROM contacts WHERE id>9;",
             params![],
-        );
+        )
+        .unwrap();
         sql::execute(
             context,
             &context.sql,
             "DELETE FROM chats WHERE id>9;",
             params![],
-        );
+        )
+        .unwrap();
         sql::execute(
             context,
             &context.sql,
             "DELETE FROM chats_contacts;",
             params![],
-        );
+        )
+        .unwrap();
         sql::execute(
             context,
             &context.sql,
             "DELETE FROM msgs WHERE id>9;",
             params![],
-        );
+        )
+        .unwrap();
         sql::execute(
             context,
             &context.sql,
             "DELETE FROM config WHERE keyname LIKE 'imap.%' OR keyname LIKE 'configured%';",
             params![],
-        );
-        sql::execute(context, &context.sql, "DELETE FROM leftgrps;", params![]);
+        )
+        .unwrap();
+        sql::execute(context, &context.sql, "DELETE FROM leftgrps;", params![]).unwrap();
         info!(context, 0, "(8) Rest but server config reset.");
     }
 
@@ -129,7 +135,8 @@ unsafe fn poke_spec(context: &Context, spec: *const libc::c_char) -> libc::c_int
         real_spec = dc_strdup(spec);
         context
             .sql
-            .set_config(context, "import_spec", Some(as_str(real_spec)));
+            .set_config(context, "import_spec", Some(as_str(real_spec)))
+            .unwrap();
         current_block = 7149356873433890176;
     } else {
         let rs = context.sql.get_config(context, "import_spec");
diff --git a/examples/simple.rs b/examples/simple.rs
index 2213ec572..643ed5624 100644
--- a/examples/simple.rs
+++ b/examples/simple.rs
@@ -86,8 +86,9 @@ fn main() {
         let args = std::env::args().collect::<Vec<String>>();
         assert_eq!(args.len(), 2, "missing password");
         let pw = args[1].clone();
-        ctx.set_config(config::Config::Addr, Some("d@testrun.org"));
-        ctx.set_config(config::Config::MailPw, Some(&pw));
+        ctx.set_config(config::Config::Addr, Some("d@testrun.org"))
+            .unwrap();
+        ctx.set_config(config::Config::MailPw, Some(&pw)).unwrap();
         dc_configure(&ctx);
 
         thread::sleep(duration);