---

yaml
---
r: 106122
b: refs/heads/auto
c: 0305ed5
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: c01e2f05a3ef27e464d1f0057ddabcde6ffde70c
+refs/heads/auto: 0305ed5d22e4a70e819c7e5989d8af7dafb3288e
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/metadata/loader.rs

@@ -284,46 +284,38 @@ impl<'a> Context<'a> {
     //                reading dylib metadata is quite slow.
     fn extract_one(&mut self, m: HashSet<Path>, flavor: &str,
                    slot: &mut Option<MetadataBlob>) -> Option<Path> {
-        let mut ret = None::<Path>;
-        let mut error = 0;
+        if m.len() == 0 { return None }
+        if m.len() > 1 {
+            self.sess.span_err(self.span,
+                               format!("multiple {} candidates for `{}` \
+                                        found", flavor, self.crate_id.name));
+            for (i, path) in m.iter().enumerate() {
+                self.sess.span_note(self.span,
+                                    format!(r"candidate \#{}: {}", i + 1,
+                                            path.display()));
+            }
+            return None
+        }
 
-        for lib in m.move_iter() {
+        let lib = m.move_iter().next().unwrap();
+        if slot.is_none() {
             info!("{} reading metadata from: {}", flavor, lib.display());
-            let metadata = match get_metadata_section(self.os, &lib) {
+            match get_metadata_section(self.os, &lib) {
                 Ok(blob) => {
                     if self.crate_matches(blob.as_slice()) {
-                        blob
+                        *slot = Some(blob);
                     } else {
                         info!("metadata mismatch");
-                        continue
+                        return None;
                     }
                 }
                 Err(_) => {
                     info!("no metadata found");
-                    continue
+                    return None
                 }
-            };
-            if ret.is_some() {
-                self.sess.span_err(self.span,
-                                   format!("multiple {} candidates for `{}` \
-                                            found", flavor, self.crate_id.name));
-                self.sess.span_note(self.span,
-                                    format!(r"candidate \#1: {}",
-                                            ret.get_ref().display()));
-                error = 1;
-                ret = None;
-            }
-            if error > 0 {
-                error += 1;
-                self.sess.span_note(self.span,
-                                    format!(r"candidate \#{}: {}", error,
-                                            lib.display()));
-                continue
             }
-            *slot = Some(metadata);
-            ret = Some(lib);
         }
-        return if error > 0 {None} else {ret}
+        return Some(lib);
     }
 
     fn crate_matches(&mut self, crate_data: &[u8]) -> bool {

branches/auto/src/libstd/prelude.rs

@@ -59,6 +59,7 @@ pub use slice::{ImmutableEqVector, ImmutableTotalOrdVector, ImmutableCloneableVe
 pub use slice::{OwnedVector, OwnedCloneableVector, OwnedEqVector};
 pub use slice::{MutableVector, MutableTotalOrdVector};
 pub use slice::{Vector, VectorVector, CloneableVector, ImmutableVector};
+pub use vec::Vec;
 
 // Reexported runtime types
 pub use comm::{channel, Sender, Receiver};