Skip to content

Commit bce838d

Browse files
committed
---
yaml --- r: 10737 b: refs/heads/snap-stage3 c: 4812672 h: refs/heads/master i: 10735: 527c271 v: v3
1 parent 05933fa commit bce838d

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 1228c55ef0ec41215054c5db1693b84fbb58674d
4+
refs/heads/snap-stage3: 481267299d1c5a1ddcacf68ce1ce3f3fb48c0cd5
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rustc/middle/trans/base.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5456,17 +5456,12 @@ fn crate_ctxt_to_encode_parms(cx: @crate_ctxt)
54565456

54575457
fn impl_map(cx: @crate_ctxt,
54585458
id: ast::node_id) -> [(ast::ident, ast::def_id)]/~ {
5459-
alt *cx.maps.impl_map.get(id) {
5460-
list::cons(impls, @list::nil) {
5461-
(*impls).map {|i|
5462-
(i.ident, i.did)
5463-
}
5464-
}
5465-
_ {
5466-
cx.sess.bug(#fmt("encode_info_for_mod: empty impl_map \
5467-
entry for %?", id));
5468-
}
5459+
let mut result = []/~;
5460+
for list::each(cx.maps.impl_map.get(id)) {
5461+
|impls|
5462+
result += (*impls).map({|i| (i.ident, i.did) });
54695463
}
5464+
ret result;
54705465
}
54715466
}
54725467

0 commit comments

Comments
 (0)