diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs index 388ae97a1026a6ae11425efff00d7bd41ca641f6..a7c2ab8f31e07715323954fccc05718e8f0faa6f 100644 --- a/src/comp/back/link.rs +++ b/src/comp/back/link.rs @@ -406,7 +406,7 @@ fn symbol_hash(ty::ctxt tcx, sha1 sha, &ty::t t, str crate_meta_name, sha.input_str("-"); sha.input_str(crate_meta_name); sha.input_str("-"); - sha.input_str(metadata::Encode::ty_str(cx, t)); + sha.input_str(metadata::encode::ty_str(cx, t)); auto hash = truncated_sha1_result(sha); // Prefix with _ so that it never blends into adjacent digits diff --git a/src/comp/middle/metadata.rs b/src/comp/middle/metadata.rs index f8cb1e8fb9aaebfa3ed14c86b0b2afbea98812e5..d8e67aa2881fdfa4682b6b3775820dc29b795a78 100644 --- a/src/comp/middle/metadata.rs +++ b/src/comp/middle/metadata.rs @@ -80,7 +80,7 @@ tag abbrev_ctxt { ac_no_abbrevs; ac_use_abbrevs(hashmap[ty::t, ty_abbrev]); } -mod Encode { +mod encode { type ctxt = rec(fn(&def_id) -> str ds, // Def -> str Callback: @@ -454,7 +454,7 @@ fn encode_type(&@trans::crate_ctxt cx, &ebml::writer ebml_w, &ty::t typ) { auto f = def_to_str; auto ty_str_ctxt = @rec(ds=f, tcx=cx.tcx, abbrevs=ac_use_abbrevs(cx.type_abbrevs)); - Encode::enc_ty(io::new_writer_(ebml_w.writer), ty_str_ctxt, typ); + encode::enc_ty(io::new_writer_(ebml_w.writer), ty_str_ctxt, typ); ebml::end_tag(ebml_w); } diff --git a/src/comp/pretty/ppaux.rs b/src/comp/pretty/ppaux.rs index d8be2bf7712cc3b2826c3f486e441a7b357860e5..de782e2fe6c5a2b11333e000115ca0e52e66fc0a 100644 --- a/src/comp/pretty/ppaux.rs +++ b/src/comp/pretty/ppaux.rs @@ -133,7 +133,7 @@ fn mt_to_str(&ctxt cx, &mt m) -> str { fn ty_to_short_str(&ctxt cx, t typ) -> str { auto f = def_to_str; auto ecx = @rec(ds=f, tcx=cx, abbrevs=middle::metadata::ac_no_abbrevs); - auto s = middle::metadata::Encode::ty_str(ecx, typ); + auto s = middle::metadata::encode::ty_str(ecx, typ); if (str::byte_len(s) >= 32u) { s = str::substr(s, 0u, 32u); } ret s; }