auto merge of #11963 : alexcrichton/rust/fix-rustpkg, r=brson

Right now the bots are all injecting a libstd version, so all the rustpkg tests
are passing. All rustpkg compilations will fail unless the version number is
explicitly given because rustpkg attempts to exactly guess the target file name.
Switch back to using a pattern match in order to unbreak tests.

Closes #11852

diff --git a/src/librustpkg/path_util.rs b/src/librustpkg/path_util.rs
index a0d49e7565f185062373793f55b1bef787f57bef..908e5e5c3810f5fd638a0c132e825ac764627318 100644 (file)
--- a/src/librustpkg/path_util.rs
+++ b/src/librustpkg/path_util.rs
@@ -21,9 +21,7 @@
 use std::os;
 use std::io;
 use std::io::fs;
-use extra::hex::ToHex;
 use syntax::crateid::CrateId;
-use rustc::util::sha2::{Digest, Sha256};
 use rustc::metadata::filesearch::{libdir, relative_target_lib_path};
 use rustc::driver::driver::host_triple;
 use messages::*;
@@ -206,24 +204,27 @@ pub fn system_library(sysroot: &Path, crate_id: &CrateId) -> Option<Path> {
 }
 
 fn library_in(crate_id: &CrateId, dir_to_search: &Path) -> Option<Path> {
-    let mut hasher = Sha256::new();
-    hasher.reset();
-    hasher.input_str(crate_id.to_str());
-    let hash = hasher.result_bytes().to_hex();
-    let hash = hash.slice_chars(0, 8);
-
-    let lib_name = format!("{}-{}-{}", crate_id.name, hash, crate_id.version_or_default());
-    let filenames = [
-        format!("{}{}.{}", "lib", lib_name, "rlib"),
-        format!("{}{}{}", os::consts::DLL_PREFIX, lib_name, os::consts::DLL_SUFFIX),
+    let version_str = match crate_id.version {
+        Some(ref v) => format!("-{}", *v),
+        None => ~"",
+    };
+    let patterns = ~[
+        (format!("lib{}", crate_id.name), format!("{}.rlib", version_str)),
+        (format!("{}{}", os::consts::DLL_PREFIX, crate_id.name),
+         format!("{}{}", version_str, os::consts::DLL_SUFFIX)),
     ];
 
-    for filename in filenames.iter() {
-        debug!("filename = {}", filename.as_slice());
-        let path = dir_to_search.join(filename.as_slice());
-        if path.exists() {
-            debug!("found: {}", path.display());
-            return Some(path);
+    for (prefix, suffix) in patterns.move_iter() {
+        let files = match io::result(|| fs::readdir(dir_to_search)) {
+            Ok(dir) => dir, Err(..) => continue,
+        };
+        for file in files.move_iter() {
+            let filename = match file.filename_str() {
+                Some(s) => s, None => continue,
+            };
+            if filename.starts_with(prefix) && filename.ends_with(suffix) {
+                return Some(file.clone())
+            }
         }
     }
     debug!("warning: library_in_workspace didn't find a library in {} for {}",