Replace Result return types with Cow<'static, str>

Author: STBoyden

src/cache.rs

@@ -1,6 +1,7 @@
 use crate::project::Project;
 use serde_derive::*;
 use std::{
+    borrow::Cow,
     collections::hash_map::DefaultHasher,
     fs::*,
     hash::*,
@@ -43,15 +44,16 @@ impl Cache {
         }
     }
 
-    fn get_all_files(project: &Project) -> Result<Vec<FileData>, String> {
+    fn get_all_files(project: &Project) -> Result<Vec<FileData>, Cow<'static, str>> {
         let dir_contents: Vec<PathBuf> = match read_dir(project.get_directories().get_source_dir()) {
             Ok(cont) => cont,
             Err(e) =>
                 return Err(format!(
                     "Could not read source directory (\"{}\"): {}",
                     project.get_directories().get_source_dir(),
                     e
-                )),
+                )
+                .into()),
         }
         .into_iter()
         .map(|x| x.unwrap().path())
@@ -88,15 +90,15 @@ impl Cache {
         Ok(files)
     }
 
-    pub fn new(project: &Project) -> Result<Self, String> {
+    pub fn new(project: &Project) -> Result<Self, Cow<'static, str>> {
         Ok(Self {
             files: Self::get_all_files(project)?,
         })
     }
 
-    pub fn get_changed(&self, project: &Project) -> Result<Vec<PathBuf>, String> {
+    pub fn get_changed(&self, project: &Project) -> Result<Vec<PathBuf>, Cow<'static, str>> {
         if !Path::new("Ocean.lock").exists() {
-            return Err("Cannot find Ocean.lock in project root.".to_string());
+            return Err("Cannot find Ocean.lock in project root.".into());
         }
 
         let mut changed = vec![];
@@ -112,9 +114,9 @@ impl Cache {
         Ok(changed)
     }
 
-    pub fn update_cache<'a>(&mut self, project: &Project) -> Result<(), &'a str> {
+    pub fn update_cache<'a>(&mut self, project: &Project) -> Result<(), Cow<'static, str>> {
         if !Path::new("Ocean.lock").exists() {
-            return Err("Cannot find Ocean.lock in project root.");
+            return Err("Cannot find Ocean.lock in project root.".into());
         }
 
         self.files = Self::get_all_files(project).unwrap();

src/commands.rs

@@ -1,5 +1,6 @@
 use crate::{cache::Cache, editors::*, language::*, platform::*, project::*};
 use std::{
+    borrow::Cow,
     env::{self, current_dir, set_current_dir},
     ffi::OsStr,
     fs::{create_dir_all, read_dir, remove_dir_all, remove_file, rename, File},
@@ -28,12 +29,12 @@ impl Commands {
         split.join("\n")
     }
 
-    fn get_toml(path: Option<&str>, search_count: Option<u32>) -> Result<Project, String> {
+    fn get_toml(path: Option<&str>, search_count: Option<u32>) -> Result<Project, Cow<'static, str>> {
         let search_count = search_count.unwrap_or(0);
 
         if search_count > 4 {
             return Err(
-                "Could not find Ocean.toml, please make sure that you are in a valid project directory.".to_string(),
+                "Could not find Ocean.toml, please make sure that you are in a valid project directory.".into(),
             );
         }
 
@@ -47,7 +48,7 @@ impl Commands {
 
                 if let Ok(mut f) = File::open("Ocean.toml") {
                     if f.read_to_string(&mut contents).is_err() {
-                        return Err("Could not read file".to_string());
+                        return Err("Could not read file".into());
                     }
                 };
 

src/editors.rs

@@ -1,8 +1,8 @@
 use crate::project::Project;
-use std::{collections::HashMap, env, path::Path};
+use std::{borrow::Cow, collections::HashMap, env, path::Path};
 
 pub trait Editor<T> {
-    fn get_compiler_path(project: &Project) -> Result<String, String> {
+    fn get_compiler_path(project: &Project) -> Result<String, Cow<'static, str>> {
         let mut ret_path = String::new();
 
         match env::var_os("PATH") {
@@ -31,11 +31,11 @@ pub trait Editor<T> {
                         ret_path = path.to_str().unwrap().to_string();
                     }
                 },
-            None => return Err("Cannot find PATH environment variable".to_string()),
+            None => return Err("Cannot find PATH environment variable".into()),
         };
 
         if ret_path == "" {
-            return Err("Cannot find compiler in PATH. Did you add the compiler's directory to the PATH?".to_string());
+            return Err("Cannot find compiler in PATH. Did you add the compiler's directory to the PATH?".into());
         }
 
         Ok(ret_path)

src/main.rs

@@ -9,14 +9,14 @@ mod platform;
 mod project;
 
 use commands::Commands;
-use std::env;
+use std::{borrow::Cow, env};
 
-fn parse_args(mut args: Vec<String>) -> Result<(), String> {
+fn parse_args(mut args: Vec<String>) -> Result<(), Cow<'static, str>> {
     let platforms = ["linux", "osx", "windows"];
 
     if args[1..].is_empty() {
         Commands::help(None);
-        return Err("No arguments were specified".to_string());
+        return Err("No arguments were specified".into());
     } else {
         args = args[1..].to_vec();
     }