---

yaml
---
r: 33971
b: refs/heads/snap-stage3
c: d2ad028
h: refs/heads/master
i:
  33969: 4497c96
  33967: c0b9164
v: v3

Author: catamorphism

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: fe9a339939e27e8cb617c04a80661297d47e4d70
+refs/heads/snap-stage3: d2ad028a7c70866df375172a2377bdf966b25d9d
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/metadata/csearch.rs

@@ -11,7 +11,7 @@
 // Searching for information from the cstore
 
 use std::ebml;
-use Reader = std::ebml::Reader;
+use reader = std::ebml::reader;
 use syntax::ast;
 use syntax::ast_util;
 use syntax::ast_map;
@@ -192,7 +192,7 @@ fn get_field_type(tcx: ty::ctxt, class_id: ast::def_id,
                   def: ast::def_id) -> ty::ty_param_bounds_and_ty {
     let cstore = tcx.cstore;
     let cdata = cstore::get_crate_data(cstore, class_id.crate);
-    let all_items = Reader::get_doc(Reader::Doc(cdata.data), tag_items);
+    let all_items = reader::get_doc(reader::Doc(cdata.data), tag_items);
     debug!("Looking up %?", class_id);
     let class_doc = expect(tcx.diag,
                            decoder::maybe_find_item(class_id.node, all_items),

branches/snap-stage3/src/librustc/metadata/decoder.rs

@@ -15,7 +15,7 @@ use util::ppaux::ty_to_str;
 use std::{ebml, map};
 use std::map::HashMap;
 use io::WriterUtil;
-use Writer = ebml::Writer;
+use writer = ebml::writer;
 use syntax::ast::*;
 use syntax::print::pprust;
 use syntax::{ast_util, visit};
@@ -50,7 +50,7 @@ export encode_def_id;
 type abbrev_map = map::HashMap<ty::t, tyencode::ty_abbrev>;
 
 type encode_inlined_item = fn@(ecx: @encode_ctxt,
-                               ebml_w: Writer::Serializer,
+                               ebml_w: writer::Serializer,
                                path: ast_map::path,
                                ii: ast::inlined_item);
 
@@ -96,21 +96,21 @@ fn reachable(ecx: @encode_ctxt, id: node_id) -> bool {
     ecx.reachable.contains_key(id)
 }
 
-fn encode_name(ecx: @encode_ctxt, ebml_w: Writer::Serializer, name: ident) {
+fn encode_name(ecx: @encode_ctxt, ebml_w: writer::Serializer, name: ident) {
     ebml_w.wr_tagged_str(tag_paths_data_name, ecx.tcx.sess.str_of(name));
 }
 
-fn encode_impl_type_basename(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn encode_impl_type_basename(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                              name: ident) {
     ebml_w.wr_tagged_str(tag_item_impl_type_basename,
                          ecx.tcx.sess.str_of(name));
 }
 
-fn encode_def_id(ebml_w: Writer::Serializer, id: def_id) {
+fn encode_def_id(ebml_w: writer::Serializer, id: def_id) {
     ebml_w.wr_tagged_str(tag_def_id, def_to_str(id));
 }
 
-fn encode_region_param(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn encode_region_param(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                        it: @ast::item) {
     let opt_rp = ecx.tcx.region_paramd_items.find(it.id);
     for opt_rp.each |rp| {
@@ -120,7 +120,7 @@ fn encode_region_param(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
     }
 }
 
-fn encode_mutability(ebml_w: Writer::Serializer, mt: class_mutability) {
+fn encode_mutability(ebml_w: writer::Serializer, mt: class_mutability) {
     do ebml_w.wr_tag(tag_class_mut) {
         let val = match mt {
           class_immutable => 'a',
@@ -132,7 +132,7 @@ fn encode_mutability(ebml_w: Writer::Serializer, mt: class_mutability) {
 
 type entry<T> = {val: T, pos: uint};
 
-fn add_to_index(ecx: @encode_ctxt, ebml_w: Writer::Serializer, path: &[ident],
+fn add_to_index(ecx: @encode_ctxt, ebml_w: writer::Serializer, path: &[ident],
                 index: &mut ~[entry<~str>], name: ident) {
     let mut full_path = ~[];
     full_path.push_all(path);
@@ -143,7 +143,7 @@ fn add_to_index(ecx: @encode_ctxt, ebml_w: Writer::Serializer, path: &[ident],
          pos: ebml_w.writer.tell()});
 }
 
-fn encode_trait_ref(ebml_w: Writer::Serializer, ecx: @encode_ctxt,
+fn encode_trait_ref(ebml_w: writer::Serializer, ecx: @encode_ctxt,
                     t: @trait_ref) {
     ebml_w.start_tag(tag_impl_trait);
     encode_type(ecx, ebml_w, node_id_to_type(ecx.tcx, t.ref_id));
@@ -152,15 +152,15 @@ fn encode_trait_ref(ebml_w: Writer::Serializer, ecx: @encode_ctxt,
 
 
 // Item info table encoding
-fn encode_family(ebml_w: Writer::Serializer, c: char) {
+fn encode_family(ebml_w: writer::Serializer, c: char) {
     ebml_w.start_tag(tag_items_data_item_family);
     ebml_w.writer.write(&[c as u8]);
     ebml_w.end_tag();
 }
 
 fn def_to_str(did: def_id) -> ~str { fmt!("%d:%d", did.crate, did.node) }
 
-fn encode_ty_type_param_bounds(ebml_w: Writer::Serializer, ecx: @encode_ctxt,
+fn encode_ty_type_param_bounds(ebml_w: writer::Serializer, ecx: @encode_ctxt,
                                params: @~[ty::param_bounds]) {
     let ty_str_ctxt = @{diag: ecx.diag,
                         ds: def_to_str,
@@ -174,21 +174,21 @@ fn encode_ty_type_param_bounds(ebml_w: Writer::Serializer, ecx: @encode_ctxt,
     }
 }
 
-fn encode_type_param_bounds(ebml_w: Writer::Serializer, ecx: @encode_ctxt,
+fn encode_type_param_bounds(ebml_w: writer::Serializer, ecx: @encode_ctxt,
                             params: ~[ty_param]) {
     let ty_param_bounds =
         @params.map(|param| ecx.tcx.ty_param_bounds.get(param.id));
     encode_ty_type_param_bounds(ebml_w, ecx, ty_param_bounds);
 }
 
 
-fn encode_variant_id(ebml_w: Writer::Serializer, vid: def_id) {
+fn encode_variant_id(ebml_w: writer::Serializer, vid: def_id) {
     ebml_w.start_tag(tag_items_data_item_variant);
     ebml_w.writer.write(str::to_bytes(def_to_str(vid)));
     ebml_w.end_tag();
 }
 
-fn write_type(ecx: @encode_ctxt, ebml_w: Writer::Serializer, typ: ty::t) {
+fn write_type(ecx: @encode_ctxt, ebml_w: writer::Serializer, typ: ty::t) {
     let ty_str_ctxt =
         @{diag: ecx.diag,
           ds: def_to_str,
@@ -198,7 +198,7 @@ fn write_type(ecx: @encode_ctxt, ebml_w: Writer::Serializer, typ: ty::t) {
     tyencode::enc_ty(ebml_w.writer, ty_str_ctxt, typ);
 }
 
-fn write_vstore(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn write_vstore(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                 vstore: ty::vstore) {
     let ty_str_ctxt =
         @{diag: ecx.diag,
@@ -209,13 +209,13 @@ fn write_vstore(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
     tyencode::enc_vstore(ebml_w.writer, ty_str_ctxt, vstore);
 }
 
-fn encode_type(ecx: @encode_ctxt, ebml_w: Writer::Serializer, typ: ty::t) {
+fn encode_type(ecx: @encode_ctxt, ebml_w: writer::Serializer, typ: ty::t) {
     ebml_w.start_tag(tag_items_data_item_type);
     write_type(ecx, ebml_w, typ);
     ebml_w.end_tag();
 }
 
-fn encode_symbol(ecx: @encode_ctxt, ebml_w: Writer::Serializer, id: node_id) {
+fn encode_symbol(ecx: @encode_ctxt, ebml_w: writer::Serializer, id: node_id) {
     ebml_w.start_tag(tag_items_data_item_symbol);
     let sym = match ecx.item_symbols.find(id) {
       Some(ref x) => (*x),
@@ -228,27 +228,27 @@ fn encode_symbol(ecx: @encode_ctxt, ebml_w: Writer::Serializer, id: node_id) {
     ebml_w.end_tag();
 }
 
-fn encode_discriminant(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn encode_discriminant(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                        id: node_id) {
     ebml_w.start_tag(tag_items_data_item_symbol);
     ebml_w.writer.write(str::to_bytes(ecx.discrim_symbols.get(id)));
     ebml_w.end_tag();
 }
 
-fn encode_disr_val(_ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn encode_disr_val(_ecx: @encode_ctxt, ebml_w: writer::Serializer,
                    disr_val: int) {
     ebml_w.start_tag(tag_disr_val);
     ebml_w.writer.write(str::to_bytes(int::to_str(disr_val,10u)));
     ebml_w.end_tag();
 }
 
-fn encode_parent_item(ebml_w: Writer::Serializer, id: def_id) {
+fn encode_parent_item(ebml_w: writer::Serializer, id: def_id) {
     ebml_w.start_tag(tag_items_data_parent_item);
     ebml_w.writer.write(str::to_bytes(def_to_str(id)));
     ebml_w.end_tag();
 }
 
-fn encode_enum_variant_info(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn encode_enum_variant_info(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                             id: node_id, variants: ~[variant],
                             path: ast_map::path, index: @mut ~[entry<int>],
                             ty_params: ~[ty_param]) {
@@ -285,9 +285,9 @@ fn encode_enum_variant_info(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
     }
 }
 
-fn encode_path(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn encode_path(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                path: ast_map::path, name: ast_map::path_elt) {
-    fn encode_path_elt(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+    fn encode_path_elt(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                        elt: ast_map::path_elt) {
         let (tag, name) = match elt {
           ast_map::path_mod(name) => (tag_path_elt_mod, name),
@@ -306,7 +306,7 @@ fn encode_path(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
     }
 }
 
-fn encode_info_for_mod(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn encode_info_for_mod(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                        md: _mod, id: node_id, path: ast_map::path,
                        name: ident) {
     ebml_w.start_tag(tag_items_data_item);
@@ -365,15 +365,15 @@ fn encode_info_for_mod(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
     ebml_w.end_tag();
 }
 
-fn encode_visibility(ebml_w: Writer::Serializer, visibility: visibility) {
+fn encode_visibility(ebml_w: writer::Serializer, visibility: visibility) {
     encode_family(ebml_w, match visibility {
         public => 'g',
         private => 'j',
         inherited => 'N'
     });
 }
 
-fn encode_self_type(ebml_w: Writer::Serializer, self_type: ast::self_ty_) {
+fn encode_self_type(ebml_w: writer::Serializer, self_type: ast::self_ty_) {
     ebml_w.start_tag(tag_item_trait_method_self_ty);
 
     // Encode the base self type.
@@ -405,14 +405,14 @@ fn encode_self_type(ebml_w: Writer::Serializer, self_type: ast::self_ty_) {
     ebml_w.end_tag();
 }
 
-fn encode_method_sort(ebml_w: Writer::Serializer, sort: char) {
+fn encode_method_sort(ebml_w: writer::Serializer, sort: char) {
     ebml_w.start_tag(tag_item_trait_method_sort);
     ebml_w.writer.write(&[ sort as u8 ]);
     ebml_w.end_tag();
 }
 
 /* Returns an index of items in this class */
-fn encode_info_for_class(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn encode_info_for_class(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                          id: node_id, path: ast_map::path,
                          class_tps: ~[ty_param],
                          fields: ~[@struct_field],
@@ -468,7 +468,7 @@ fn encode_info_for_class(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
 }
 
 // This is for encoding info for ctors and dtors
-fn encode_info_for_ctor(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn encode_info_for_ctor(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                         id: node_id, ident: ident, path: ast_map::path,
                         item: Option<inlined_item>, tps: ~[ty_param]) {
         ebml_w.start_tag(tag_items_data_item);
@@ -493,7 +493,7 @@ fn encode_info_for_ctor(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
         ebml_w.end_tag();
 }
 
-fn encode_info_for_method(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn encode_info_for_method(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                           impl_path: ast_map::path, should_inline: bool,
                           parent_id: node_id,
                           m: @method, all_tps: ~[ty_param]) {
@@ -548,7 +548,7 @@ fn should_inline(attrs: ~[attribute]) -> bool {
 }
 
 
-fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                         item: @item, index: @mut ~[entry<int>],
                         path: ast_map::path) {
 
@@ -561,7 +561,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
         };
     if !must_write && !reachable(ecx, item.id) { return; }
 
-    fn add_to_index_(item: @item, ebml_w: Writer::Serializer,
+    fn add_to_index_(item: @item, ebml_w: writer::Serializer,
                      index: @mut ~[entry<int>]) {
         index.push({val: item.id, pos: ebml_w.writer.tell()});
     }
@@ -851,7 +851,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
     }
 }
 
-fn encode_info_for_foreign_item(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn encode_info_for_foreign_item(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                                 nitem: @foreign_item,
                                 index: @mut ~[entry<int>],
                                 path: ast_map::path, abi: foreign_abi) {
@@ -884,7 +884,7 @@ fn encode_info_for_foreign_item(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
     ebml_w.end_tag();
 }
 
-fn encode_info_for_items(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn encode_info_for_items(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                          crate: @crate) -> ~[entry<int>] {
     let index = @mut ~[];
     ebml_w.start_tag(tag_items_data);
@@ -939,7 +939,7 @@ fn create_index<T: Copy Hash IterBytes>(index: ~[entry<T>]) ->
     return buckets_frozen;
 }
 
-fn encode_index<T>(ebml_w: Writer::Serializer, buckets: ~[@~[entry<T>]],
+fn encode_index<T>(ebml_w: writer::Serializer, buckets: ~[@~[entry<T>]],
                    write_fn: fn(io::Writer, T)) {
     let writer = ebml_w.writer;
     ebml_w.start_tag(tag_index);
@@ -974,7 +974,7 @@ fn write_int(writer: io::Writer, &&n: int) {
     writer.write_be_u32(n as u32);
 }
 
-fn encode_meta_item(ebml_w: Writer::Serializer, mi: meta_item) {
+fn encode_meta_item(ebml_w: writer::Serializer, mi: meta_item) {
     match mi.node {
       meta_word(ref name) => {
         ebml_w.start_tag(tag_meta_item_word);
@@ -1011,7 +1011,7 @@ fn encode_meta_item(ebml_w: Writer::Serializer, mi: meta_item) {
     }
 }
 
-fn encode_attributes(ebml_w: Writer::Serializer, attrs: ~[attribute]) {
+fn encode_attributes(ebml_w: writer::Serializer, attrs: ~[attribute]) {
     ebml_w.start_tag(tag_attributes);
     for attrs.each |attr| {
         ebml_w.start_tag(tag_attribute);
@@ -1072,7 +1072,7 @@ fn synthesize_crate_attrs(ecx: @encode_ctxt, crate: @crate) -> ~[attribute] {
     return attrs;
 }
 
-fn encode_crate_deps(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn encode_crate_deps(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                      cstore: cstore::CStore) {
 
     fn get_ordered_deps(ecx: @encode_ctxt, cstore: cstore::CStore)
@@ -1118,7 +1118,7 @@ fn encode_crate_deps(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
     ebml_w.end_tag();
 }
 
-fn encode_crate_dep(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
+fn encode_crate_dep(ecx: @encode_ctxt, ebml_w: writer::Serializer,
                     dep: decoder::crate_dep) {
     ebml_w.start_tag(tag_crate_dep);
     ebml_w.start_tag(tag_crate_dep_name);
@@ -1133,7 +1133,7 @@ fn encode_crate_dep(ecx: @encode_ctxt, ebml_w: Writer::Serializer,
     ebml_w.end_tag();
 }
 
-fn encode_hash(ebml_w: Writer::Serializer, hash: ~str) {
+fn encode_hash(ebml_w: writer::Serializer, hash: ~str) {
     ebml_w.start_tag(tag_crate_hash);
     ebml_w.writer.write(str::to_bytes(hash));
     ebml_w.end_tag();
@@ -1171,7 +1171,7 @@ fn encode_metadata(parms: encode_parms, crate: @crate) -> ~[u8] {
         type_abbrevs: ty::new_ty_hash()
      });
 
-    let ebml_w = Writer::Serializer(wr as io::Writer);
+    let ebml_w = writer::Serializer(wr as io::Writer);
 
     encode_hash(ebml_w, ecx.link_meta.extras_hash);