diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-07-30 11:26:20 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-07-30 11:26:20 -0700 |
| commit | 2e231fbcb7cba67de674dfa350e65dc367ad3ecc (patch) | |
| tree | f21ccf457985558253e03ea149791b93eedbd06d /src | |
| parent | 52ed570f1c0adeadaf36524d08a38246c8ac2669 (diff) | |
| download | rust-2e231fbcb7cba67de674dfa350e65dc367ad3ecc.tar.gz rust-2e231fbcb7cba67de674dfa350e65dc367ad3ecc.zip | |
LONG LINES\!
Diffstat (limited to 'src')
| -rw-r--r-- | src/rustc/back/link.rs | 7 | ||||
| -rw-r--r-- | src/rustc/middle/trans/base.rs | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/rustc/back/link.rs b/src/rustc/back/link.rs index 1e078b2f9c1..022b2183ec7 100644 --- a/src/rustc/back/link.rs +++ b/src/rustc/back/link.rs @@ -338,7 +338,8 @@ fn build_link_meta(sess: session, c: ast::crate, output: ~str, } // This calculates CMH as defined above - fn crate_meta_extras_hash(symbol_hasher: hash::streaming, _crate: ast::crate, + fn crate_meta_extras_hash(symbol_hasher: hash::streaming, + _crate: ast::crate, metas: provided_metas, dep_hashes: ~[@~str]) -> ~str { fn len_and_str(s: ~str) -> ~str { @@ -359,7 +360,9 @@ fn build_link_meta(sess: session, c: ast::crate, output: ~str, symbol_hasher.input_str(len_and_str(*key)); symbol_hasher.input_str(len_and_str_lit(value)); } - ast::meta_word(name) { symbol_hasher.input_str(len_and_str(*name)); } + ast::meta_word(name) { + symbol_hasher.input_str(len_and_str(*name)); + } ast::meta_list(_, _) { // FIXME (#607): Implement this fail ~"unimplemented meta_item variant"; diff --git a/src/rustc/middle/trans/base.rs b/src/rustc/middle/trans/base.rs index c33a1330f9e..b624bc63bfe 100644 --- a/src/rustc/middle/trans/base.rs +++ b/src/rustc/middle/trans/base.rs @@ -5651,7 +5651,8 @@ fn trans_crate(sess: session::session, crate: @ast::crate, tcx: ty::ctxt, maps: astencode::maps) -> (ModuleRef, link_meta) { let symbol_hasher = hash::siphash(0,0); - let link_meta = link::build_link_meta(sess, *crate, output, symbol_hasher); + let link_meta = + link::build_link_meta(sess, *crate, output, symbol_hasher); let reachable = reachable::find_reachable(crate.node.module, emap, tcx, maps.method_map); |