Skip to content

Commit 147c4de

Browse files
committed
---
yaml --- r: 121459 b: refs/heads/snap-stage3 c: fb296b8 h: refs/heads/master i: 121457: ef66839 121455: e239b0b v: v3
1 parent a9c5abb commit 147c4de

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 7a93beef7f692b34168ad69633f56483d38ad8fc
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 86dda1b6f3db582005a3138e6cc10eb924ad7da3
4+
refs/heads/snap-stage3: fb296b80118a2c594986c09f2b6ec97829ba3d2d
55
refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/metadata/creader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ impl<'a> PluginMetadataReader<'a> {
448448
macros: macros.move_iter().map(|x| x.to_string()).collect(),
449449
registrar_symbol: registrar,
450450
};
451-
if should_link {
451+
if should_link && existing_match(&self.env, &info.crate_id, None).is_none() {
452452
// register crate now to avoid double-reading metadata
453453
register_crate(&mut self.env, &None, info.ident.as_slice(),
454454
&info.crate_id, krate.span, library);
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![feature(phase)]
12+
13+
#[phase(plugin, link)] extern crate std;
14+
15+
fn main() {}

0 commit comments

Comments
 (0)