Merge pull request #688 from malbarbo/sort-semver

Sort toolchains by semantic version.
rust-lang · Aug 26, 2016 · c8cc167 · c8cc167
2 parents 0f03f9a + 2c18936
commit c8cc167
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/rustup-utils/Cargo.toml b/src/rustup-utils/Cargo.toml
@@ -20,6 +20,7 @@ rustc-serialize = "0.3.19"
 sha2 = "0.1.2"
 url = "1.1"
 toml = "0.1.27"
+semver = "0.4.0"
 download = { path = "../download" }
 
 [target."cfg(windows)".dependencies]

diff --git a/src/rustup-utils/src/lib.rs b/src/rustup-utils/src/lib.rs
@@ -9,6 +9,7 @@ extern crate sha2;
 extern crate url;
 extern crate toml;
 extern crate download;
+extern crate semver;
 
 #[cfg(windows)]
 extern crate winapi;

diff --git a/src/rustup-utils/src/utils.rs b/src/rustup-utils/src/utils.rs
@@ -551,15 +551,27 @@ pub fn string_from_winreg_value(val: &winreg::RegValue) -> Option<String> {
 }
 
 pub fn toolchain_sort<T: AsRef<str>>(v: &mut Vec<T>) {
-    fn toolchain_sort_key(s: &str) -> String {
+    use semver::{Version, Identifier};
+
+    fn special_version(ord: u64, s: &str) -> Version {
+        Version {
+            major: 0,
+            minor: 0,
+            patch: 0,
+            pre: vec![Identifier::Numeric(ord), Identifier::AlphaNumeric(s.into())],
+            build: vec![],
+        }
+    }
+
+    fn toolchain_sort_key(s: &str) -> Version {
         if s.starts_with("stable") {
-            format!("0{}", s)
+            special_version(0, s)
         } else if s.starts_with("beta") {
-            format!("1{}", s)
+            special_version(1, s)
         } else if s.starts_with("nightly") {
-            format!("2{}", s)
+            special_version(2, s)
         } else {
-            format!("3{}", s)
+            Version::parse(&s.replace("_", "-")).unwrap_or_else(|_| special_version(3, s))
         }
     }
 
@@ -571,3 +583,36 @@ pub fn toolchain_sort<T: AsRef<str>>(v: &mut Vec<T>) {
         a_key.cmp(&b_key)
     });
 }
+
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_toochain_sort() {
+        let expected = vec![
+            "stable-x86_64-unknown-linux-gnu",
+            "beta-x86_64-unknown-linux-gnu",
+            "nightly-x86_64-unknown-linux-gnu",
+            "1.0.0-x86_64-unknown-linux-gnu",
+            "1.2.0-x86_64-unknown-linux-gnu",
+            "1.8.0-x86_64-unknown-linux-gnu",
+            "1.10.0-x86_64-unknown-linux-gnu",
+        ];
+
+        let mut v = vec![
+            "1.8.0-x86_64-unknown-linux-gnu",
+            "1.0.0-x86_64-unknown-linux-gnu",
+            "nightly-x86_64-unknown-linux-gnu",
+            "stable-x86_64-unknown-linux-gnu",
+            "1.10.0-x86_64-unknown-linux-gnu",
+            "beta-x86_64-unknown-linux-gnu",
+            "1.2.0-x86_64-unknown-linux-gnu",
+        ];
+
+        toolchain_sort(&mut v);
+
+        assert_eq!(expected, v);
+    }
+}