PublicKey Changes + Formatting Fixes

Author: tcyrus

ssh-key/src/dot_ssh.rs

@@ -72,12 +72,12 @@ impl DotSsh {
 
     /// Write a private key into `~/.ssh`.
     pub fn write_private_key(&self, filename: impl AsRef<Path>, key: &PrivateKey) -> Result<()> {
-        key.write_openssh_file(&self.path.join(filename), Default::default())
+        key.write_openssh_file(self.path.join(filename), Default::default())
     }
 
     /// Write a public key into `~/.ssh`.
     pub fn write_public_key(&self, filename: impl AsRef<Path>, key: &PublicKey) -> Result<()> {
-        key.write_openssh_file(&self.path.join(filename))
+        key.write_openssh_file(self.path.join(filename))
     }
 }
 
@@ -100,7 +100,7 @@ impl Iterator for PrivateKeysIter {
         loop {
             let entry = self.read_dir.next()?.ok()?;
 
-            if let Ok(key) = PrivateKey::read_openssh_file(&entry.path()) {
+            if let Ok(key) = PrivateKey::read_openssh_file(entry.path()) {
                 return Some(key);
             }
         }
@@ -119,7 +119,7 @@ impl Iterator for PublicKeysIter {
         loop {
             let entry = self.read_dir.next()?.ok()?;
 
-            if let Ok(key) = PublicKey::read_openssh_file(&entry.path()) {
+            if let Ok(key) = PublicKey::read_openssh_file(entry.path()) {
                 return Some(key);
             }
         }

ssh-key/src/private.rs

@@ -366,7 +366,11 @@ impl PrivateKey {
 
     /// Write private key as an OpenSSH-formatted PEM file.
     #[cfg(feature = "std")]
-    pub fn write_openssh_file<P: AsRef<Path>>(&self, path: P, line_ending: LineEnding) -> Result<()> {
+    pub fn write_openssh_file<P: AsRef<Path>>(
+        &self,
+        path: P,
+        line_ending: LineEnding,
+    ) -> Result<()> {
         let pem = self.to_openssh(line_ending)?;
 
         #[cfg(not(unix))]

ssh-key/src/public.rs

@@ -237,14 +237,14 @@ impl PublicKey {
 
     /// Read public key from an OpenSSH-formatted file.
     #[cfg(feature = "std")]
-    pub fn read_openssh_file(path: &Path) -> Result<Self> {
+    pub fn read_openssh_file<P: AsRef<Path>>(path: P) -> Result<Self> {
         let input = fs::read_to_string(path)?;
         Self::from_openssh(&input)
     }
 
     /// Write public key as an OpenSSH-formatted file.
     #[cfg(feature = "std")]
-    pub fn write_openssh_file(&self, path: &Path) -> Result<()> {
+    pub fn write_openssh_file<P: AsRef<Path>>(&self, path: P) -> Result<()> {
         let mut encoded = self.to_openssh()?;
         encoded.push('\n'); // TODO(tarcieri): OS-specific line endings?