diff --git a/AUTHORS.txt b/AUTHORS.txt
index 628fa4c86da..92903a26093 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -161,4 +161,4 @@ Wade Mealing <wmealing@gmail.com>
 William Ting <william.h.ting@gmail.com>
 Yasuhiro Fujii <y-fujii@mimosa-pudica.net>
 Youngsoo Son <ysson83@gmail.com>
-Zack Corr <zackcorr95@gmail.com>
+Zack Corr <zack@z0w0.me>
diff --git a/src/libcore/semver.rs b/src/libstd/semver.rs
similarity index 96%
rename from src/libcore/semver.rs
rename to src/libstd/semver.rs
index fc5d951edc5..8af30b794e2 100644
--- a/src/libcore/semver.rs
+++ b/src/libstd/semver.rs
@@ -51,7 +51,7 @@ impl Version: cmp::Ord {
             },
             None => false
         })
-    } 
+    }
     #[inline(always)]
     pure fn le(&self, other: &Version) -> bool {
         self.major <= other.major ||
@@ -173,7 +173,7 @@ fn parse_reader(rdr: io::Reader) -> Option<(Version, char)> {
           ch))
 }
 
-pub fn parse(s: ~str) -> Option<Version> {
+pub fn parse(s: &str) -> Option<Version> {
     do io::with_str_reader(s) |rdr| {
         do parse_reader(rdr).chain_ref |&item| {
             let (version, ch) = item;
@@ -200,25 +200,25 @@ fn test_parse() {
     assert parse("a.b.c") == None;
     assert parse("1.2.3 abc") == None;
 
-    assert parse("1.2.3") == Some({
+    assert parse("1.2.3") == Some(Version {
         major: 1u,
         minor: 2u,
         patch: 3u,
         tag: None,
     });
-    assert parse("  1.2.3  ") == Some({
+    assert parse("  1.2.3  ") == Some(Version {
         major: 1u,
         minor: 2u,
         patch: 3u,
         tag: None,
     });
-    assert parse("1.2.3-alpha1") == Some({
+    assert parse("1.2.3-alpha1") == Some(Version {
         major: 1u,
         minor: 2u,
         patch: 3u,
         tag: Some("alpha1")
     });
-    assert parse("  1.2.3-alpha1  ") == Some({
+    assert parse("  1.2.3-alpha1  ") == Some(Version {
         major: 1u,
         minor: 2u,
         patch: 3u,