Skip to content

Commit 2e73e56

Browse files
committed
---
yaml --- r: 27661 b: refs/heads/try c: c8bad36 h: refs/heads/master i: 27659: 48a126e v: v3
1 parent e8ec991 commit 2e73e56

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
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: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
5-
refs/heads/try: 8b79bed6dd9299af6caacc0c56a30ec3c2a92c92
5+
refs/heads/try: c8bad3631234f02c297e9117df67f3a4b3cd645c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/rustc/middle/typeck/collect.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ fn ensure_trait_methods(ccx: @crate_ctxt, id: ast::node_id) {
197197

198198
let tcx = ccx.tcx;
199199
let rp = tcx.region_paramd_items.contains_key(id);
200-
match check tcx.items.get(id) {
200+
match tcx.items.get(id) {
201201
ast_map::node_item(@{node: ast::item_trait(params, _, ms), _}, _) => {
202202
store_methods::<ast::trait_method>(ccx, id, ms, |m| {
203203
let trait_bounds = ty_param_bounds(ccx, params);
@@ -218,6 +218,7 @@ fn ensure_trait_methods(ccx: @crate_ctxt, id: ast::node_id) {
218218
ty_of_method(ccx, m, rp)
219219
});
220220
}
221+
_ => { /* Ignore things that aren't traits or classes */ }
221222
}
222223
}
223224

0 commit comments

Comments
 (0)