Simplify config

[rbdr/blog] / src / remote / mod.rs

diff --git a/src/remote/mod.rs b/src/remote/mod.rs
index de90ef57f4f2b6bb585ae38c996fe75cf849963f..19514af5ba35e8c2ed66e7b1d10c334ad30cff8c 100644 (file)
--- a/src/remote/mod.rs
+++ b/src/remote/mod.rs
@@ -27,7 +27,7 @@ pub fn remove(remote_config: &PathBuf) -> Result<()> {
 
 pub fn sync_up(data_directory: &PathBuf, remote_config: &PathBuf) -> Result<()> {
     let remote_address = read_remote(remote_config)
 
 pub fn sync_up(data_directory: &PathBuf, remote_config: &PathBuf) -> Result<()> {
     let remote_address = read_remote(remote_config)

-        .expect("No remote is configured");
+        .ok_or_else(|| Error::new(Other, "No remote is configured"))?;

     create_dir_all(data_directory)?;
     let remotes = available_remotes();
     for remote in remotes {
     create_dir_all(data_directory)?;
     let remotes = available_remotes();
     for remote in remotes {


@@ -40,7 +40,7 @@ pub fn sync_up(data_directory: &PathBuf, remote_config: &PathBuf) -> Result<()>
 
 pub fn sync_down(data_directory: &PathBuf, remote_config: &PathBuf) -> Result<()> {
     let remote_address = read_remote(remote_config)
 
 pub fn sync_down(data_directory: &PathBuf, remote_config: &PathBuf) -> Result<()> {
     let remote_address = read_remote(remote_config)

-        .expect("No remote is configured");
+        .ok_or_else(|| Error::new(Other, "No remote is configured"))?;

     create_dir_all(data_directory)?;
     let remotes = available_remotes();
     for remote in remotes {
     create_dir_all(data_directory)?;
     let remotes = available_remotes();
     for remote in remotes {