vbrandl/hoc
1
0
Fork 0
Code Issues 1 Pull Requests Actions Projects Releases Wiki Activity

Cleanup and use internal result type
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Valentin Brandl 2019-06-16 22:20:09 +02:00
parent 4446d9b879
commit 140265b713
No known key found for this signature in database
GPG Key ID: 30D341DD34118D7D
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cache.rs
View File

@ -1,4 +1,4 @@
use crate::Error; use crate::error::{Error, Result};
use std::{ use std::{
borrow::Cow, borrow::Cow,
fs::{create_dir_all, File, OpenOptions}, fs::{create_dir_all, File, OpenOptions},
@ -17,7 +17,7 @@ pub(crate) enum CacheState<'a> {
} }
impl<'a> CacheState<'a> { impl<'a> CacheState<'a> {
pub(crate) fn read_from_file(path: impl AsRef<Path>, head: &str) -> Result<CacheState, Error> { pub(crate) fn read_from_file(path: impl AsRef<Path>, head: &str) -> Result<CacheState> {
if path.as_ref().exists() { if path.as_ref().exists() {
let cache: Cache = serde_json::from_reader(BufReader::new(File::open(path)?))?; let cache: Cache = serde_json::from_reader(BufReader::new(File::open(path)?))?;
if cache.head == head { if cache.head == head {
@ -49,7 +49,7 @@ pub(crate) struct Cache<'a> {
} }
impl<'a> Cache<'a> { impl<'a> Cache<'a> {
pub(crate) fn write_to_file(&self, path: impl AsRef<Path>) -> Result<(), Error> { pub(crate) fn write_to_file(&self, path: impl AsRef<Path>) -> Result<()> {
create_dir_all(path.as_ref().parent().ok_or(Error::Internal)?)?; create_dir_all(path.as_ref().parent().ok_or(Error::Internal)?)?;
serde_json::to_writer( serde_json::to_writer(
OpenOptions::new() OpenOptions::new()