Skip to content

Commit db80bf0

Browse files
committed
---
yaml --- r: 42478 b: refs/heads/try c: 1244c0b h: refs/heads/master v: v3
1 parent 80fbeec commit db80bf0

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
5-
refs/heads/try: 440f8dfc4e72575e1b5f38b3ebc3d0576e7b8e15
5+
refs/heads/try: 1244c0b6fd8325e1eab274e6d9b989e1ee1e2c57
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/librustc/metadata/creader.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ fn resolve_crate(e: env, ident: ast::ident, +metas: ~[@ast::meta_item],
227227
filesearch: e.filesearch,
228228
span: span,
229229
ident: ident,
230-
metas: copy metas, // XXX: Bad copy.
230+
metas: metas,
231231
hash: hash,
232232
os: e.os,
233233
static: e.static,
@@ -252,7 +252,8 @@ fn resolve_crate(e: env, ident: ast::ident, +metas: ~[@ast::meta_item],
252252
let cnum_map = resolve_crate_deps(e, cdata);
253253

254254
let cname =
255-
match attr::last_meta_item_value_str_by_name(metas, ~"name") {
255+
match attr::last_meta_item_value_str_by_name(load_ctxt.metas,
256+
~"name") {
256257
option::Some(ref v) => (/*bad*/copy *v),
257258
option::None => /*bad*/copy *e.intr.get(ident)
258259
};

0 commit comments

Comments
 (0)