Skip to content

Commit 89a6efe

Browse files
committed
---
yaml --- r: 4879 b: refs/heads/master c: 10269df h: refs/heads/master i: 4877: aa88d00 4875: a06a05b 4871: d51cf58 4863: 9cf28fa v: v3
1 parent 9a32064 commit 89a6efe

File tree

8 files changed

+152
-152
lines changed

8 files changed

+152
-152
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: 081caf5bb8e22102ba517c7484dafcf65705c681
2+
refs/heads/master: 10269dfaeb223f28421eb4564b03aa31ef49c5a1

trunk/src/comp/back/link.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ fn truncated_sha1_result(sha: sha1) -> str {
392392

393393

394394
// This calculates STH for a symbol, as defined above
395-
fn symbol_hash(tcx: ty::ctxt, sha: sha1, t: &ty::t, link_meta: &link_meta) ->
395+
fn symbol_hash(tcx: ty::ctxt, sha: sha1, t: ty::t, link_meta: &link_meta) ->
396396
str {
397397
// NB: do *not* use abbrevs here as we want the symbol names
398398
// to be independent of one another in the crate.
@@ -410,7 +410,7 @@ fn symbol_hash(tcx: ty::ctxt, sha: sha1, t: &ty::t, link_meta: &link_meta) ->
410410
ret "_" + hash;
411411
}
412412

413-
fn get_symbol_hash(ccx: &@crate_ctxt, t: &ty::t) -> str {
413+
fn get_symbol_hash(ccx: &@crate_ctxt, t: ty::t) -> str {
414414
let hash = "";
415415
alt ccx.type_sha1s.find(t) {
416416
some(h) { hash = h; }
@@ -440,12 +440,12 @@ fn exported_name(path: &[str], hash: &str, _vers: &str) -> str {
440440

441441
}
442442

443-
fn mangle_exported_name(ccx: &@crate_ctxt, path: &[str], t: &ty::t) -> str {
443+
fn mangle_exported_name(ccx: &@crate_ctxt, path: &[str], t: ty::t) -> str {
444444
let hash = get_symbol_hash(ccx, t);
445445
ret exported_name(path, hash, ccx.link_meta.vers);
446446
}
447447

448-
fn mangle_internal_name_by_type_only(ccx: &@crate_ctxt, t: &ty::t, name: &str)
448+
fn mangle_internal_name_by_type_only(ccx: &@crate_ctxt, t: ty::t, name: &str)
449449
-> str {
450450
let s = util::ppaux::ty_to_short_str(ccx.tcx, t);
451451
let hash = get_symbol_hash(ccx, t);

trunk/src/comp/metadata/encoder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ fn encode_variant_id(ebml_w: &ebml::writer, vid: &def_id) {
193193
ebml::end_tag(ebml_w);
194194
}
195195

196-
fn encode_type(ecx: &@encode_ctxt, ebml_w: &ebml::writer, typ: &ty::t) {
196+
fn encode_type(ecx: &@encode_ctxt, ebml_w: &ebml::writer, typ: ty::t) {
197197
ebml::start_tag(ebml_w, tag_items_data_item_type);
198198
let f = def_to_str;
199199
let ty_str_ctxt =
@@ -618,7 +618,7 @@ fn encode_metadata(cx: &@crate_ctxt, crate: &@crate) -> str {
618618
}
619619

620620
// Get the encoded string for a type
621-
fn encoded_ty(tcx: &ty::ctxt, t: &ty::t) -> str {
621+
fn encoded_ty(tcx: &ty::ctxt, t: ty::t) -> str {
622622
let cx = @{ds: def_to_str, tcx: tcx, abbrevs: tyencode::ac_no_abbrevs};
623623
let sw = io::string_writer();
624624
tyencode::enc_ty(sw.get_writer(), cx, t);

trunk/src/comp/metadata/tyencode.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fn cx_uses_abbrevs(cx: &@ctxt) -> bool {
3636
}
3737
}
3838

39-
fn enc_ty(w: &io::writer, cx: &@ctxt, t: &ty::t) {
39+
fn enc_ty(w: &io::writer, cx: &@ctxt, t: ty::t) {
4040
alt cx.abbrevs {
4141
ac_no_abbrevs. {
4242
let result_str;
@@ -202,7 +202,7 @@ fn enc_proto(w: &io::writer, proto: proto) {
202202
}
203203
}
204204

205-
fn enc_ty_fn(w: &io::writer, cx: &@ctxt, args: &[ty::arg], out: &ty::t,
205+
fn enc_ty_fn(w: &io::writer, cx: &@ctxt, args: &[ty::arg], out: ty::t,
206206
cf: &controlflow, constrs: &[@ty::constr]) {
207207
w.write_char('[');
208208
for arg: ty::arg in args {

trunk/src/comp/middle/gc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ fn add_gc_root(cx: &@block_ctxt, llval: ValueRef, ty: ty::t) -> @block_ctxt {
9494
ret bcx;
9595
}
9696

97-
fn type_is_gc_relevant(cx: &ty::ctxt, ty: &ty::t) -> bool {
97+
fn type_is_gc_relevant(cx: &ty::ctxt, ty: ty::t) -> bool {
9898
alt ty::struct(cx, ty) {
9999
ty::ty_nil. | ty::ty_bot. | ty::ty_bool. | ty::ty_int. | ty::ty_float. |
100100
ty::ty_uint. | ty::ty_machine(_) | ty::ty_char. | ty::ty_istr. |

0 commit comments

Comments
 (0)