---

yaml
---
r: 148957
b: refs/heads/try2
c: aa829c2
h: refs/heads/master
i:
  148955: 6af4918
v: v3

Author: brendanzab

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 78cb1e2ab0b282654a39ad61549cf5baabaae316
+refs/heads/try2: aa829c290417a080f6d9bbcc08914618d7088d9c
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsemver/lib.rs

@@ -35,6 +35,7 @@
 
 use std::char;
 use std::cmp;
+use std::fmt;
 use std::option::{Option, Some, None};
 use std::to_str::ToStr;
 
@@ -59,13 +60,20 @@ impl cmp::Ord for Identifier {
     }
 }
 
+impl fmt::Show for Identifier {
+    #[inline]
+    fn fmt(version: &Identifier, f: &mut fmt::Formatter) -> fmt::Result {
+        match *version {
+            Numeric(ref n) => fmt::Show::fmt(n, f),
+            AlphaNumeric(ref s) => fmt::Show::fmt(s, f)
+        }
+    }
+}
+
 impl ToStr for Identifier {
     #[inline]
     fn to_str(&self) -> ~str {
-        match self {
-            &Numeric(n) => n.to_str(),
-            &AlphaNumeric(ref s) => s.to_str()
-        }
+        format!("{}", *self)
     }
 }
 
@@ -87,20 +95,32 @@ pub struct Version {
     build: ~[Identifier],
 }
 
+impl fmt::Show for Version {
+    #[inline]
+    fn fmt(version: &Version, f: &mut fmt::Formatter) -> fmt::Result {
+        if_ok!(write!(f.buf, "{}.{}.{}", version.major, version.minor, version.patch))
+        if !version.pre.is_empty() {
+            if_ok!(write!(f.buf, "-"));
+            for (i, x) in version.pre.iter().enumerate() {
+                if i != 0 { if_ok!(write!(f.buf, ".")) };
+                if_ok!(fmt::Show::fmt(x, f));
+            }
+        }
+        if !version.build.is_empty() {
+            if_ok!(write!(f.buf, "+"));
+            for (i, x) in version.build.iter().enumerate() {
+                if i != 0 { if_ok!(write!(f.buf, ".")) };
+                if_ok!(fmt::Show::fmt(x, f));
+            }
+        }
+        Ok(())
+    }
+}
+
 impl ToStr for Version {
     #[inline]
     fn to_str(&self) -> ~str {
-        let s = format!("{}.{}.{}", self.major, self.minor, self.patch);
-        let s = if self.pre.is_empty() {
-            s
-        } else {
-            format!("{}-{}", s, self.pre.map(|i| i.to_str()).connect("."))
-        };
-        if self.build.is_empty() {
-            s
-        } else {
-            format!("{}+{}", s, self.build.map(|i| i.to_str()).connect("."))
-        }
+        format!("{}", *self)
     }
 }
 
@@ -365,6 +385,22 @@ fn test_ne() {
     assert!(parse("1.2.3+23")    != parse("1.2.3+42"));
 }
 
+#[test]
+fn test_show() {
+    assert_eq!(format!("{}", parse("1.2.3").unwrap()), ~"1.2.3");
+    assert_eq!(format!("{}", parse("1.2.3-alpha1").unwrap()), ~"1.2.3-alpha1");
+    assert_eq!(format!("{}", parse("1.2.3+build.42").unwrap()), ~"1.2.3+build.42");
+    assert_eq!(format!("{}", parse("1.2.3-alpha1+42").unwrap()), ~"1.2.3-alpha1+42");
+}
+
+#[test]
+fn test_to_str() {
+    assert_eq!(parse("1.2.3").unwrap().to_str(), ~"1.2.3");
+    assert_eq!(parse("1.2.3-alpha1").unwrap().to_str(), ~"1.2.3-alpha1");
+    assert_eq!(parse("1.2.3+build.42").unwrap().to_str(), ~"1.2.3+build.42");
+    assert_eq!(parse("1.2.3-alpha1+42").unwrap().to_str(), ~"1.2.3-alpha1+42");
+}
+
 #[test]
 fn test_lt() {
     assert!(parse("0.0.0")        < parse("1.2.3-alpha2"));