From 866a8cc4fc2d5ed49dc4f75078dba6a973788eb9 Mon Sep 17 00:00:00 2001
From: Scott Lamb <slamb@slamb.org>
Date: Mon, 1 Jul 2019 00:06:22 -0500
Subject: [PATCH] fix "cargo test" errors and warnings in a9f6479

---
 src/cmds/config/cameras.rs |  4 ++--
 src/streamer.rs            | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cmds/config/cameras.rs b/src/cmds/config/cameras.rs
index f19ab26..7af2898 100644
--- a/src/cmds/config/cameras.rs
+++ b/src/cmds/config/cameras.rs
@@ -125,8 +125,8 @@ fn press_test(siv: &mut Cursive, t: db::StreamType) {
     };
 
     if !c.username.is_empty() {
-        url.set_username(&c.username);
-        url.set_password(Some(&c.password));
+        let _ = url.set_username(&c.username);
+        let _ = url.set_password(Some(&c.password));
     }
     siv.add_layer(views::Dialog::text(format!("Testing {} stream at {}. This may take a while \
                                                on timeout or if you have a long key frame interval",
diff --git a/src/streamer.rs b/src/streamer.rs
index f630ce5..d3d26a4 100644
--- a/src/streamer.rs
+++ b/src/streamer.rs
@@ -73,10 +73,10 @@ impl<'a, C, S> Streamer<'a, C, S> where C: 'a + Clocks + Clone, S: 'a + stream::
         let mut url = Url::parse(&s.rtsp_url)?;
         let mut redacted_url = url.clone();
         if !c.username.is_empty() {
-            url.set_username(&c.username);
-            redacted_url.set_username(&c.username);
-            url.set_password(Some(&c.password));
-            redacted_url.set_password(Some("redacted"));
+            url.set_username(&c.username).map_err(|_| format_err!("can't set username"))?;
+            redacted_url.set_username(&c.username).unwrap();
+            url.set_password(Some(&c.password)).unwrap();
+            redacted_url.set_password(Some("redacted")).unwrap();
         }
         Ok(Streamer {
             shutdown: env.shutdown.clone(),
@@ -357,7 +357,7 @@ mod tests {
             let s = l.streams_by_id().get(&testutil::TEST_STREAM_ID).unwrap();
             let dir = db.dirs_by_stream_id.get(&testutil::TEST_STREAM_ID).unwrap().clone();
             stream = super::Streamer::new(&env, dir, db.syncer_channel.clone(),
-                                          testutil::TEST_STREAM_ID, camera, s, 0, 3);
+                                          testutil::TEST_STREAM_ID, camera, s, 0, 3).unwrap();
         }
         stream.run();
         assert!(opener.streams.lock().is_empty());