Skip to content

Commit 68ce861

Browse files
committed
---
yaml --- r: 2546 b: refs/heads/master c: 8b3f359 h: refs/heads/master v: v3
1 parent a448394 commit 68ce861

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: ec30c71296fa428512396366b416f20262799380
2+
refs/heads/master: 8b3f3594424200b28f0297b7b7024ecdbf79e665

trunk/src/comp/middle/typeck.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ fn write_nil_type(ty::ctxt tcx, &node_type_table ntt, uint node_id) {
404404
// We then annotate the AST with the resulting types and return the annotated
405405
// AST, along with a table mapping item IDs to their types.
406406

407-
mod Collect {
407+
mod collect {
408408
type ctxt = rec(session::session sess,
409409
@ty_item_table id_to_ty_item,
410410
ty::type_cache type_cache,
@@ -3300,16 +3300,15 @@ type typecheck_result = tup(node_type_table, ty::type_cache, @ast::crate);
33003300

33013301
fn check_crate(&ty::ctxt tcx, &@ast::crate crate) -> typecheck_result {
33023302
auto sess = tcx.sess;
3303-
auto result = Collect::collect_item_types(sess, tcx, crate);
3303+
auto result = collect::collect_item_types(sess, tcx, crate);
33043304

33053305
let vec[ast::obj_field] fields = vec();
33063306

33073307
auto hasher = hash_unify_cache_entry;
33083308
auto eqer = eq_unify_cache_entry;
33093309
auto unify_cache =
33103310
map::mk_hashmap[unify_cache_entry,ty::Unify::result](hasher, eqer);
3311-
auto fpt =
3312-
mk_fn_purity_table(crate); // use a variation on Collect
3311+
auto fpt = mk_fn_purity_table(crate); // use a variation on collect
33133312
let node_type_table node_types = result._3;
33143313

33153314
auto ccx = @rec(sess=sess,

0 commit comments

Comments
 (0)