Skip to content

Commit fbdae07

Browse files
committed
---
yaml --- r: 22831 b: refs/heads/master c: 2e231fb h: refs/heads/master i: 22829: b3e69bb 22827: da43c5b 22823: 5ce9b53 22815: 243d1cf v: v3
1 parent bf93866 commit fbdae07

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 52ed570f1c0adeadaf36524d08a38246c8ac2669
2+
refs/heads/master: 2e231fbcb7cba67de674dfa350e65dc367ad3ecc
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/back/link.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,8 @@ fn build_link_meta(sess: session, c: ast::crate, output: ~str,
338338
}
339339

340340
// This calculates CMH as defined above
341-
fn crate_meta_extras_hash(symbol_hasher: hash::streaming, _crate: ast::crate,
341+
fn crate_meta_extras_hash(symbol_hasher: hash::streaming,
342+
_crate: ast::crate,
342343
metas: provided_metas,
343344
dep_hashes: ~[@~str]) -> ~str {
344345
fn len_and_str(s: ~str) -> ~str {
@@ -359,7 +360,9 @@ fn build_link_meta(sess: session, c: ast::crate, output: ~str,
359360
symbol_hasher.input_str(len_and_str(*key));
360361
symbol_hasher.input_str(len_and_str_lit(value));
361362
}
362-
ast::meta_word(name) { symbol_hasher.input_str(len_and_str(*name)); }
363+
ast::meta_word(name) {
364+
symbol_hasher.input_str(len_and_str(*name));
365+
}
363366
ast::meta_list(_, _) {
364367
// FIXME (#607): Implement this
365368
fail ~"unimplemented meta_item variant";

trunk/src/rustc/middle/trans/base.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5651,7 +5651,8 @@ fn trans_crate(sess: session::session, crate: @ast::crate, tcx: ty::ctxt,
56515651
maps: astencode::maps)
56525652
-> (ModuleRef, link_meta) {
56535653
let symbol_hasher = hash::siphash(0,0);
5654-
let link_meta = link::build_link_meta(sess, *crate, output, symbol_hasher);
5654+
let link_meta =
5655+
link::build_link_meta(sess, *crate, output, symbol_hasher);
56555656
let reachable = reachable::find_reachable(crate.node.module, emap, tcx,
56565657
maps.method_map);
56575658

0 commit comments

Comments
 (0)