Skip to content

Commit 14a018e

Browse files
committed
---
yaml --- r: 8154 b: refs/heads/snap-stage3 c: 0b4851c h: refs/heads/master v: v3
1 parent 2af6d42 commit 14a018e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
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: 02082be4a73921702703ca93c8387b040181029a
4+
refs/heads/snap-stage3: 0b4851cff6751a015dcfc1d6d495231058b2f515
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/comp/metadata/decoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ fn get_impls_for_mod(cdata: cmd, m_id: ast::node_id,
286286
let did = translate_def_id(cdata, parse_def_id(ebml::doc_data(doc)));
287287
let item = lookup_item(did.node, data), nm = item_name(item);
288288
if alt name { some(n) { n == nm } none { true } } {
289-
let base_tps = item_ty_param_count(doc);
289+
let base_tps = item_ty_param_count(item);
290290
result += [@{did: did, ident: nm,
291291
methods: item_impl_methods(cdata, item, base_tps)}];
292292
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2509,7 +2509,7 @@ fn lval_static_fn(bcx: @block_ctxt, fn_id: ast::def_id, id: ast::node_id,
25092509
!vec::any(tys, {|t| ty::type_has_params(t)}) {
25102510
let mono = alt substs {
25112511
some((stys, dicts)) {
2512-
if (vec::len(stys) + vec::len(stys)) > 0u {
2512+
if (vec::len(stys) + vec::len(tys)) > 0u {
25132513
monomorphic_fn(ccx, fn_id, stys + tys, some(dicts))
25142514
} else { none }
25152515
}

0 commit comments

Comments
 (0)