From cdcd645dc455a0778b91b3f7d051dbfb37c8755d Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Sat, 23 Feb 2019 18:48:34 +0100
Subject: Propagate errors from api calls to caller.

This defines an ApiResult type, and a corresponding Error type which
wraps any errors that can be returned from underlying libs. Prevents
panics due to unwraps in the core api.

The main app still unwraps, and will panic on any error, though. Fix
that later.
---
 src/error.rs | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 src/error.rs

(limited to 'src/error.rs')

diff --git a/src/error.rs b/src/error.rs
new file mode 100644
index 0000000..ed17362
--- /dev/null
+++ b/src/error.rs
@@ -0,0 +1,49 @@
+/*
+    oslobike - find free bikes in Oslo.
+    Copyright (C) 2019  Harald Eilertsen <haraldei@anduin.net>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+/// Error type returned by api calls.
+///
+/// This type wraps any error that can be returned by the underlying
+/// libs used by the oslobike api.
+#[derive(Debug)]
+pub enum Error {
+    InvalidHeaderValue(reqwest::header::InvalidHeaderValue),
+    ReqwestError(reqwest::Error),
+    JsonError(serde_json::error::Error),
+}
+
+impl From<reqwest::header::InvalidHeaderValue> for Error {
+    fn from(err: reqwest::header::InvalidHeaderValue) -> Error {
+        Error::InvalidHeaderValue(err)
+    }
+}
+
+impl From<reqwest::Error> for Error {
+    fn from(err: reqwest::Error) -> Error {
+        Error::ReqwestError(err)
+    }
+}
+
+impl From<serde_json::error::Error> for Error {
+    fn from(err: serde_json::error::Error) -> Error {
+        Error::JsonError(err)
+    }
+}
+
+/// Result type for api calls.
+pub type ApiResult<T> = std::result::Result<T, Error>;
-- 
cgit v1.2.3