From 62744449dcc14a8dc2863fa18be24e57a9c25854 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 28 Nov 2018 10:27:35 -0500
Subject: [PATCH] rust: Use Fallible<> more

Since use of the `failure` crate has been a success, let's use
it a bit more.  The big thing to convert left is `treefile.rs` which
does need a custom error so we can stop abusing `io::ErrorKind::InvalidInput`.

Closes: #1690
Approved by: jlebon
---
 rust/src/journal.rs | 6 +++---
 rust/src/utils.rs   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rust/src/journal.rs b/rust/src/journal.rs
index 06546514..9f4fb3b9 100644
--- a/rust/src/journal.rs
+++ b/rust/src/journal.rs
@@ -18,15 +18,15 @@
 
 extern crate systemd;
 
+use failure::Fallible;
 use self::systemd::id128::Id128;
 use self::systemd::journal;
-use std::io;
 
 static OSTREE_FINALIZE_STAGED_SERVICE: &'static str = "ostree-finalize-staged.service";
 static OSTREE_DEPLOYMENT_FINALIZING_MSG_ID: &'static str = "e8646cd63dff4625b77909a8e7a40994";
 static OSTREE_DEPLOYMENT_COMPLETE_MSG_ID: &'static str = "dd440e3e549083b63d0efc7dc15255f1";
 
-fn print_staging_failure_msg(msg: Option<&str>) -> io::Result<()> {
+fn print_staging_failure_msg(msg: Option<&str>) -> Fallible<()> {
     println!("Warning: failed to finalize previous deployment");
     if let Some(msg) = msg {
         println!("         {}", msg);
@@ -39,7 +39,7 @@ fn print_staging_failure_msg(msg: Option<&str>) -> io::Result<()> {
 }
 
 /// Look for a failure from ostree-finalized-stage.service in the journal of the previous boot.
-fn journal_print_staging_failure() -> io::Result<()> {
+fn journal_print_staging_failure() -> Fallible<()> {
     let mut j = journal::Journal::open(journal::JournalFiles::System, false, true)?;
 
     // first, go to the first entry of the current boot
diff --git a/rust/src/utils.rs b/rust/src/utils.rs
index 3e279a28..b0b4118e 100644
--- a/rust/src/utils.rs
+++ b/rust/src/utils.rs
@@ -24,7 +24,7 @@ use tempfile;
 
 use curl::easy::Easy;
 
-fn download_url_to_tmpfile(url: &str) -> io::Result<fs::File> {
+fn download_url_to_tmpfile(url: &str) -> Fallible<fs::File> {
     let mut tmpf = tempfile::tempfile()?;
     {
         let mut output = io::BufWriter::new(&mut tmpf);