From 4fc328e1dfb79a2cba14f603a5dd175d6029f30f Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Tue, 9 Mar 2021 02:50:22 -0500
Subject: add an error type

---
 src/output.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/output.rs')

diff --git a/src/output.rs b/src/output.rs
index 9e8c220..52495d0 100644
--- a/src/output.rs
+++ b/src/output.rs
@@ -1,3 +1,5 @@
+use crate::error::*;
+
 use futures_lite::io::AsyncWriteExt as _;
 
 use super::private::TextmodeImpl as _;
@@ -7,7 +9,7 @@ pub struct ScreenGuard {
 }
 
 impl ScreenGuard {
-    pub async fn cleanup(&mut self) -> std::io::Result<()> {
+    pub async fn cleanup(&mut self) -> Result<()> {
         if self.cleaned_up {
             return Ok(());
         }
@@ -50,7 +52,7 @@ impl super::private::TextmodeImpl for Output {
 impl super::Textmode for Output {}
 
 impl Output {
-    pub async fn new() -> std::io::Result<(Self, ScreenGuard)> {
+    pub async fn new() -> Result<(Self, ScreenGuard)> {
         write_stdout(super::INIT).await?;
 
         Ok((
@@ -71,7 +73,7 @@ impl Output {
         Self { cur, next }
     }
 
-    pub async fn refresh(&mut self) -> std::io::Result<()> {
+    pub async fn refresh(&mut self) -> Result<()> {
         let diffs = &[
             self.next().screen().contents_diff(self.cur().screen()),
             self.next().screen().input_mode_diff(self.cur().screen()),
@@ -86,9 +88,9 @@ impl Output {
     }
 }
 
-async fn write_stdout(buf: &[u8]) -> std::io::Result<()> {
+async fn write_stdout(buf: &[u8]) -> Result<()> {
     let mut stdout = blocking::Unblock::new(std::io::stdout());
-    stdout.write_all(buf).await?;
-    stdout.flush().await?;
+    stdout.write_all(buf).await.map_err(Error::WriteStdout)?;
+    stdout.flush().await.map_err(Error::WriteStdout)?;
     Ok(())
 }
-- 
cgit v1.2.3-54-g00ecf