chore: update for clippy warnings (#267)

apollographql · Feb 12, 2021 · 83a743a · 83a743a
1 parent aaca7a9
commit 83a743a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 311 deletions.
diff --git a/crates/houston/src/profile/mod.rs b/crates/houston/src/profile/mod.rs
@@ -27,12 +27,12 @@ pub struct Opts {
 }
 
 impl Profile {
-    fn base_dir(config: &Config) -> Result<PathBuf, HoustonProblem> {
-        Ok(config.home.join("profiles"))
+    fn base_dir(config: &Config) -> PathBuf {
+        config.home.join("profiles")
     }
 
-    fn dir(name: &str, config: &Config) -> Result<PathBuf, HoustonProblem> {
-        Ok(Profile::base_dir(config)?.join(name))
+    fn dir(name: &str, config: &Config) -> PathBuf {
+        Profile::base_dir(config).join(name)
     }
 
     /// Writes an api_key to the filesystem (`$APOLLO_CONFIG_HOME/profiles/<profile_name>/.sensitive`).
@@ -73,7 +73,7 @@ impl Profile {
     /// Loads and deserializes configuration from the file system for a
     /// specific profile.
     pub fn load(name: &str, config: &Config, opts: LoadOpts) -> Result<Profile, HoustonProblem> {
-        if Profile::dir(name, config)?.exists() {
+        if Profile::dir(name, config).exists() {
             if opts.sensitive {
                 let sensitive = Sensitive::load(name, config)?;
                 return Ok(Profile { sensitive });
@@ -86,7 +86,7 @@ impl Profile {
 
     /// Deletes profile data from file system.
     pub fn delete(name: &str, config: &Config) -> Result<(), HoustonProblem> {
-        let dir = Profile::dir(name, config)?;
+        let dir = Profile::dir(name, config);
         tracing::debug!(dir = ?dir);
         Ok(fs::remove_dir_all(dir).map_err(|e| match e.kind() {
             std::io::ErrorKind::NotFound => HoustonProblem::ProfileNotFound(name.to_string()),
@@ -96,7 +96,7 @@ impl Profile {
 
     /// Lists profiles based on directories in `$APOLLO_CONFIG_HOME/profiles`
     pub fn list(config: &Config) -> Result<Vec<String>, HoustonProblem> {
-        let profiles_dir = Profile::base_dir(config)?;
+        let profiles_dir = Profile::base_dir(config);
         let mut profiles = vec![];
 
         // if profiles dir doesn't exist return empty vec

diff --git a/crates/houston/src/profile/sensitive.rs b/crates/houston/src/profile/sensitive.rs
@@ -12,13 +12,13 @@ pub struct Sensitive {
 }
 
 impl Sensitive {
-    fn path(profile_name: &str, config: &Config) -> Result<PathBuf, HoustonProblem> {
-        Ok(Profile::dir(profile_name, config)?.join(".sensitive"))
+    fn path(profile_name: &str, config: &Config) -> PathBuf {
+        Profile::dir(profile_name, config).join(".sensitive")
     }
 
     /// Serializes to toml and saves to file system at `$APOLLO_CONFIG_HOME/<profile_name>/.sensitive`.
     pub fn save(&self, profile_name: &str, config: &Config) -> Result<(), HoustonProblem> {
-        let path = Sensitive::path(profile_name, config)?;
+        let path = Sensitive::path(profile_name, config);
         let data = toml::to_string(self)?;
 
         if let Some(dirs) = &path.parent() {
@@ -32,7 +32,7 @@ impl Sensitive {
 
     /// Opens and deserializes `$APOLLO_CONFIG_HOME/<profile_name>/.sensitive`.
     pub fn load(profile_name: &str, config: &Config) -> Result<Sensitive, HoustonProblem> {
-        let path = Sensitive::path(profile_name, config)?;
+        let path = Sensitive::path(profile_name, config);
         let data = fs::read_to_string(&path)?;
         tracing::debug!(path = ?path, data_len = ?data.len());
         Ok(toml::from_str(&data)?)

diff --git a/installers/npm/package-lock.json b/installers/npm/package-lock.json
diff --git a/src/command/config/auth.rs b/src/command/config/auth.rs
@@ -73,7 +73,7 @@ mod tests {
     fn it_can_set_default_api_key() {
         let config = get_config(None);
 
-        Profile::set_api_key(DEFAULT_PROFILE, &config, DEFAULT_KEY.into()).unwrap();
+        Profile::set_api_key(DEFAULT_PROFILE, &config, DEFAULT_KEY).unwrap();
         let result = Profile::get_api_key(DEFAULT_PROFILE, &config).unwrap();
         assert_eq!(result, DEFAULT_KEY);
     }
@@ -83,7 +83,7 @@ mod tests {
     fn it_can_set_custom_api_key() {
         let config = get_config(None);
 
-        Profile::set_api_key(CUSTOM_PROFILE, &config, CUSTOM_KEY.into()).unwrap();
+        Profile::set_api_key(CUSTOM_PROFILE, &config, CUSTOM_KEY).unwrap();
         let result = Profile::get_api_key(CUSTOM_PROFILE, &config).unwrap();
         assert_eq!(result, CUSTOM_KEY);
     }