---

yaml
---
r: 106125
b: refs/heads/auto
c: b568efc
h: refs/heads/master
i:
  106123: 2af41a2
v: v3

Author: bors

[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: da3625161d8f8bcb2f43d703eec8d002d0bb9c87
+refs/heads/auto: b568efc0cf173ac7b2d37284beda5fdf8a7686ab
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

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

@@ -283,38 +283,46 @@ 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> {
-        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
-        }
+        let mut ret = None::<Path>;
+        let mut error = 0;
 
-        let lib = m.move_iter().next().unwrap();
-        if slot.is_none() {
+        for lib in m.move_iter() {
             info!("{} reading metadata from: {}", flavor, lib.display());
-            match get_metadata_section(self.os, &lib) {
+            let metadata = match get_metadata_section(self.os, &lib) {
                 Ok(blob) => {
                     if self.crate_matches(blob.as_slice()) {
-                        *slot = Some(blob);
+                        blob
                     } else {
                         info!("metadata mismatch");
-                        return None;
+                        continue
                     }
                 }
                 Err(_) => {
                     info!("no metadata found");
-                    return None
+                    continue
                 }
+            };
+            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 Some(lib);
+        return if error > 0 {None} else {ret}
     }
 
     fn crate_matches(&mut self, crate_data: &[u8]) -> bool {

branches/auto/src/test/run-make/suspicious-library/Makefile

@@ -0,0 +1,7 @@
+-include ../tools.mk
+
+all:
+	$(RUSTC) foo.rs
+	touch $(call DYLIB,foo-something-special)
+	touch $(call DYLIB,foo-something-special2)
+	$(RUSTC) bar.rs

branches/auto/src/test/run-make/suspicious-library/bar.rs

@@ -0,0 +1,13 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+extern crate foo;
+
+fn main() { foo::foo() }

branches/auto/src/test/run-make/suspicious-library/foo.rs

@@ -0,0 +1,13 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[crate_type = "dylib"];
+
+pub fn foo() {}