---

yaml
---
r: 46895
b: refs/heads/try
c: 1c487b1
h: refs/heads/master
i:
  46893: 91e64d1
  46891: 5c8625a
  46887: b380170
  46879: fd48cfd
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
-refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3
+refs/heads/try: 1c487b18f3ff2ea55e377c3e8be99227c8257136
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/prelude.rs

@@ -34,7 +34,6 @@ pub use path::GenericPath;
 pub use path::Path;
 pub use path::PosixPath;
 pub use path::WindowsPath;
-pub use pipes::{GenericChan, GenericPort};
 pub use ptr::Ptr;
 pub use str::{StrSlice, Trimmable, OwnedStr};
 pub use to_bytes::IterBytes;

branches/try/src/libcore/private.rs

@@ -14,7 +14,7 @@ use cast;
 use iter;
 use libc;
 use option;
-use pipes;
+use pipes::{GenericChan, GenericPort};
 use prelude::*;
 use ptr;
 use result;

branches/try/src/libcore/private/weak_task.rs

@@ -22,7 +22,8 @@ use option::{Some, None, swap_unwrap};
 use private::at_exit::at_exit;
 use private::global::global_data_clone_create;
 use private::finally::Finally;
-use pipes::{Port, Chan, SharedChan, GenericSmartChan, stream};
+use pipes::{Port, Chan, SharedChan, GenericChan, GenericPort,
+            GenericSmartChan, stream};
 use task::{Task, task, spawn};
 use task::rt::{task_id, get_task_id};
 use hashmap::linear::LinearMap;

branches/try/src/libcore/run.rs

@@ -14,7 +14,7 @@ use io;
 use io::ReaderUtil;
 use libc;
 use libc::{pid_t, c_void, c_int};
-use pipes::{stream, SharedChan};
+use pipes::{stream, SharedChan, GenericChan, GenericPort};
 use option::{Some, None};
 use os;
 use prelude::*;

branches/try/src/librustc/metadata/common.rs

@@ -153,7 +153,5 @@ pub const tag_lang_items_item: uint = 0x73;
 pub const tag_lang_items_item_id: uint = 0x74;
 pub const tag_lang_items_item_node_id: uint = 0x75;
 
-pub const tag_item_unnamed_field: uint = 0x76;
-
 pub type link_meta = {name: @str, vers: @str, extras_hash: @str};
 

branches/try/src/librustc/metadata/csearch.rs

@@ -166,9 +166,8 @@ pub fn get_item_attrs(cstore: @mut cstore::CStore,
     decoder::get_item_attrs(cdata, def_id.node, f)
 }
 
-pub fn get_struct_fields(cstore: @mut cstore::CStore,
-                         def: ast::def_id)
-                      -> ~[ty::field_ty] {
+pub fn get_struct_fields(tcx: ty::ctxt, def: ast::def_id) -> ~[ty::field_ty] {
+    let cstore = tcx.cstore;
     let cdata = cstore::get_crate_data(cstore, def.crate);
     decoder::get_struct_fields(cstore.intr, cdata, def.node)
 }

branches/try/src/librustc/metadata/decoder.rs

@@ -42,7 +42,7 @@ use std::serialize::Decodable;
 use syntax::ast_map;
 use syntax::attr;
 use syntax::diagnostic::span_handler;
-use syntax::parse::token::{ident_interner, special_idents};
+use syntax::parse::token::ident_interner;
 use syntax::print::pprust;
 use syntax::{ast, ast_util};
 use syntax::codemap;
@@ -231,9 +231,7 @@ pub fn item_type(item_id: ast::def_id, item: ebml::Doc,
     let t = doc_type(item, tcx, cdata);
     if family_names_type(item_family(item)) {
         ty::mk_with_id(tcx, t, item_id)
-    } else {
-        t
-    }
+    } else { t }
 }
 
 fn item_impl_traits(item: ebml::Doc, tcx: ty::ctxt, cdata: cmd) -> ~[ty::t] {
@@ -663,12 +661,11 @@ fn item_impl_methods(intr: @ident_interner, cdata: cmd, item: ebml::Doc,
     rslt
 }
 
-pub fn get_impls_for_mod(intr: @ident_interner,
-                         cdata: cmd,
-                         m_id: ast::node_id,
-                         name: Option<ast::ident>,
-                         get_cdata: &fn(ast::crate_num) -> cmd)
+pub fn get_impls_for_mod(intr: @ident_interner, cdata: cmd,
+                         m_id: ast::node_id, name: Option<ast::ident>,
+                         get_cdata: fn(ast::crate_num) -> cmd)
                       -> @~[@_impl] {
+
     let data = cdata.data;
     let mod_item = lookup_item(m_id, data);
     let mut result = ~[];
@@ -890,15 +887,6 @@ pub fn get_struct_fields(intr: @ident_interner, cdata: cmd, id: ast::node_id)
             });
         }
     }
-    for reader::tagged_docs(item, tag_item_unnamed_field) |an_item| {
-        let did = item_def_id(an_item, cdata);
-        result.push(ty::field_ty {
-            ident: special_idents::unnamed_field,
-            id: did,
-            vis: ast::inherited,
-            mutability: ast::struct_immutable,
-        });
-    }
     result
 }
 

branches/try/src/librustc/metadata/encoder.rs

@@ -46,7 +46,6 @@ use syntax::ast_map;
 use syntax::ast_util::*;
 use syntax::attr;
 use syntax::diagnostic::span_handler;
-use syntax::parse::token::special_idents;
 use syntax::print::pprust;
 use syntax::{ast_util, visit};
 use syntax;
@@ -329,7 +328,7 @@ fn encode_info_for_mod(ecx: @encode_ctxt, ebml_w: writer::Encoder,
     // Encode info about all the module children.
     for md.items.each |item| {
         match item.node {
-            item_impl(*) => {
+            item_impl(*) | item_struct(*) => {
                 let (ident, did) = (item.ident, item.id);
                 debug!("(encoding info for module) ... encoding impl %s \
                         (%?/%?)",
@@ -433,28 +432,25 @@ fn encode_info_for_struct(ecx: @encode_ctxt, ebml_w: writer::Encoder,
      /* We encode both private and public fields -- need to include
         private fields to get the offsets right */
     for fields.each |field| {
-        let (nm, mt, vis) = match field.node.kind {
-            named_field(nm, mt, vis) => (nm, mt, vis),
-            unnamed_field => (
-                special_idents::unnamed_field,
-                struct_immutable,
-                inherited
-            )
-        };
-
-        let id = field.node.id;
-        index.push({val: id, pos: ebml_w.writer.tell()});
-        global_index.push({val: id, pos: ebml_w.writer.tell()});
-        ebml_w.start_tag(tag_items_data_item);
-        debug!("encode_info_for_struct: doing %s %d",
-               tcx.sess.str_of(nm), id);
-        encode_visibility(ebml_w, vis);
-        encode_name(ecx, ebml_w, nm);
-        encode_path(ecx, ebml_w, path, ast_map::path_name(nm));
-        encode_type(ecx, ebml_w, node_id_to_type(tcx, id));
-        encode_mutability(ebml_w, mt);
-        encode_def_id(ebml_w, local_def(id));
-        ebml_w.end_tag();
+        match field.node.kind {
+            named_field(nm, mt, vis) => {
+                let id = field.node.id;
+                index.push({val: id, pos: ebml_w.writer.tell()});
+                global_index.push({val: id,
+                                    pos: ebml_w.writer.tell()});
+                ebml_w.start_tag(tag_items_data_item);
+                debug!("encode_info_for_struct: doing %s %d",
+                       tcx.sess.str_of(nm), id);
+                encode_visibility(ebml_w, vis);
+                encode_name(ecx, ebml_w, nm);
+                encode_path(ecx, ebml_w, path, ast_map::path_name(nm));
+                encode_type(ecx, ebml_w, node_id_to_type(tcx, id));
+                encode_mutability(ebml_w, mt);
+                encode_def_id(ebml_w, local_def(id));
+                ebml_w.end_tag();
+            }
+            unnamed_field => {}
+        }
     }
     /*bad*/copy *index
 }
@@ -677,26 +673,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: writer::Encoder,
         encode_def_id(ebml_w, local_def(item.id));
         encode_family(ebml_w, 'S');
         encode_type_param_bounds(ebml_w, ecx, tps);
-
-        // If this is a tuple- or enum-like struct, encode the type of the
-        // constructor. Otherwise, encode the type of the struct.
-        if struct_def.fields.len() > 0 &&
-                struct_def.fields[0].node.kind == ast::unnamed_field {
-            // Tuple- or enum-like struct.
-            let ctor_id = match struct_def.ctor_id {
-                Some(ctor_id) => ctor_id,
-                None => ecx.tcx.sess.bug(~"struct def didn't have ctor id"),
-            };
-            encode_type(ecx, ebml_w, node_id_to_type(tcx, ctor_id));
-
-            // Also encode the symbol, if one is present.
-            if ecx.item_symbols.contains_key(&ctor_id) {
-                encode_symbol(ecx, ebml_w, ctor_id);
-            }
-        } else {
-            encode_type(ecx, ebml_w, node_id_to_type(tcx, item.id));
-        }
-
+        encode_type(ecx, ebml_w, node_id_to_type(tcx, item.id));
         encode_name(ecx, ebml_w, item.ident);
         encode_path(ecx, ebml_w, path, ast_map::path_name(item.ident));
         encode_region_param(ecx, ebml_w, item);
@@ -720,11 +697,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: writer::Encoder,
                    encode_def_id(ebml_w, local_def(f.node.id));
                    ebml_w.end_tag();
                 }
-                unnamed_field => {
-                    ebml_w.start_tag(tag_item_unnamed_field);
-                    encode_def_id(ebml_w, local_def(f.node.id));
-                    ebml_w.end_tag();
-                }
+                unnamed_field => {}
             }
         }
 

branches/try/src/librustc/middle/resolve.rs

@@ -13,8 +13,7 @@ use core::prelude::*;
 use driver::session;
 use driver::session::Session;
 use metadata::csearch::{each_path, get_method_names_if_trait};
-use metadata::csearch::{get_static_methods_if_impl, get_struct_fields};
-use metadata::csearch::{get_type_name_if_impl};
+use metadata::csearch::{get_static_methods_if_impl, get_type_name_if_impl};
 use metadata::cstore::find_use_stmt_cnum;
 use metadata::decoder::{def_like, dl_def, dl_field, dl_impl};
 use middle::lang_items::LanguageItems;
@@ -1660,14 +1659,6 @@ pub impl Resolver {
                     crate) building type %s",
                    final_ident);
             child_name_bindings.define_type(Public, def, dummy_sp());
-
-            // Define the struct constructor if this is a tuple-like struct.
-            let fields = get_struct_fields(self.session.cstore, def_id);
-            if fields.len() != 0 &&
-                    fields[0].ident == special_idents::unnamed_field {
-                child_name_bindings.define_value(Public, def, dummy_sp());
-            }
-
             self.structs.insert(def_id, ());
           }
           def_self(*) | def_arg(*) | def_local(*) |
@@ -1754,12 +1745,10 @@ pub impl Resolver {
                                        OverwriteDuplicates,
                                        dummy_sp());
 
-                    self.handle_external_def(def,
-                                             modules,
+                    self.handle_external_def(def, modules,
                                              child_name_bindings,
                                              self.session.str_of(final_ident),
-                                             final_ident,
-                                             new_parent);
+                                             final_ident, new_parent);
                 }
                 dl_impl(def) => {
                     // We only process static methods of impls here.

branches/try/src/librustc/middle/trans/base.rs

@@ -1905,13 +1905,8 @@ pub fn trans_tuple_struct(ccx: @crate_ctxt,
         }
     };
 
-    let fcx = new_fn_ctxt_w_id(ccx,
-                               ~[],
-                               llfndecl,
-                               ctor_id,
-                               None,
-                               param_substs,
-                               None);
+    let fcx = new_fn_ctxt_w_id(ccx, ~[], llfndecl, ctor_id, None,
+                               param_substs, None);
 
     // XXX: Bad copy.
     let raw_llargs = create_llargs_for_fn_args(fcx, no_self, copy fn_args);

branches/try/src/librustc/middle/trans/reachable.rs

@@ -122,9 +122,6 @@ fn traverse_public_item(cx: ctx, item: @item) {
         }
       }
       item_struct(struct_def, tps) => {
-        for struct_def.ctor_id.each |&ctor_id| {
-            cx.rmap.insert(ctor_id, ());
-        }
         do option::iter(&struct_def.dtor) |dtor| {
             cx.rmap.insert(dtor.node.id, ());
             if tps.len() > 0u || attr::find_inline_attr(dtor.node.attrs)

branches/try/src/librustc/middle/ty.rs

@@ -4011,7 +4011,7 @@ pub fn lookup_struct_fields(cx: ctxt, did: ast::def_id) -> ~[field_ty] {
     }
         }
   else {
-        return csearch::get_struct_fields(cx.sess.cstore, did);
+        return csearch::get_struct_fields(cx, did);
     }
 }
 

branches/try/src/librustc/middle/typeck/coherence.rs

@@ -828,7 +828,7 @@ pub impl CoherenceChecker {
         let implementations = get_impls_for_mod(crate_store,
                                                 module_def_id,
                                                 None);
-        for implementations.each |implementation| {
+        for (*implementations).each |implementation| {
             debug!("coherence: adding impl from external crate: %s",
                    ty::item_path_str(self.crate_context.tcx,
                                      implementation.did));

branches/try/src/libuv

@@ -1 +1 @@
-Subproject commit 4d392c86feb6389f550d8110d36fa90d66c09251
+Subproject commit da33bba7c04e0873b457a9a4290bed2adf620154