commit b35a9a3d4999a3e46932c1db5fc8c8ea9ecfa8b0
author Nika Layzell <nika@thelayzells.com> Sat Dec 30 14:34:35 2017 -0500
committer Nika Layzell <nika@thelayzells.com> Sat Dec 30 14:34:35 2017 -0500
tree 2fb6a56bdf211fdd95cc8e3a486978b97608e31e
parent 1ecb6ce8c31e281906aa5c9529f754f0c3849139

Update SourceFile::path to return the FileName struct

src/stable.rs

diff --git a/src/stable.rs b/src/stable.rs
index 8b951e5..4bcaf6c 100644
--- a/src/stable.rs
+++ b/src/stable.rs
@@ -150,14 +150,23 @@
     }
 }
 
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub struct FileName(String);
+
+impl fmt::Display for FileName {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
 #[derive(Clone, PartialEq, Eq)]
 pub struct SourceFile {
-    name: String,
+    name: FileName,
 }
 
 impl SourceFile {
     /// Get the path to this source file as a string.
-    pub fn as_str(&self) -> &str {
+    pub fn path(&self) -> &FileName {
         &self.name
     }
 
@@ -167,22 +176,16 @@
     }
 }
 
-impl AsRef<str> for SourceFile {
-    fn as_ref(&self) -> &str {
-        self.as_str()
-    }
-}
-
-impl PartialEq<str> for SourceFile {
-    fn eq(&self, other: &str) -> bool {
-        self.as_ref() == other
+impl AsRef<FileName> for SourceFile {
+    fn as_ref(&self) -> &FileName {
+        self.path()
     }
 }
 
 impl fmt::Debug for SourceFile {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         f.debug_struct("SourceFile")
-            .field("path", &self.as_str())
+            .field("path", &self.path())
             .field("is_real", &self.is_real())
             .finish()
     }
@@ -299,7 +302,7 @@
             let cm = cm.borrow();
             let fi = cm.fileinfo(*self);
             SourceFile {
-                name: fi.name.clone(),
+                name: FileName(fi.name.clone()),
             }
         })
     }