---

yaml
---
r: 140894
b: refs/heads/try2
c: 226f4df
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: f89e00b3d149d78b8fe21251912d9c7fa78b9f15
+refs/heads/try2: 226f4dfdfb5c65c7cb966f47cbc6a550a805c051
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -234,13 +234,14 @@ pub fn get_field_type(tcx: ty::ctxt, class_id: ast::def_id,
     }
 }
 
-// Given a def_id for an impl, return the trait it implements,
-// if there is one.
-pub fn get_impl_trait(tcx: ty::ctxt,
-                      def: ast::def_id) -> Option<@ty::TraitRef> {
+// Given a def_id for an impl or class, return the traits it implements,
+// or the empty vector if it's not for an impl or for a class that implements
+// traits
+pub fn get_impl_traits(tcx: ty::ctxt,
+                       def: ast::def_id) -> ~[@ty::TraitRef] {
     let cstore = tcx.cstore;
     let cdata = cstore::get_crate_data(cstore, def.crate);
-    decoder::get_impl_trait(cdata, def.node, tcx)
+    decoder::get_impl_traits(cdata, def.node, tcx)
 }
 
 pub fn get_impl_method(cstore: @mut cstore::CStore,

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

@@ -415,20 +415,19 @@ pub fn get_type_param_count(data: @~[u8], id: ast::node_id) -> uint {
     item_ty_param_count(lookup_item(id, data))
 }
 
-pub fn get_impl_trait(cdata: cmd,
+pub fn get_impl_traits(cdata: cmd,
                        id: ast::node_id,
-                       tcx: ty::ctxt) -> Option<@ty::TraitRef>
+                       tcx: ty::ctxt) -> ~[@ty::TraitRef]
 {
     let item_doc = lookup_item(id, cdata.data);
-    let mut result = None;
+    let mut results = ~[];
     for reader::tagged_docs(item_doc, tag_item_trait_ref) |tp| {
         let trait_ref =
             @parse_trait_ref_data(tp.data, cdata.cnum, tp.start, tcx,
                                   |_, did| translate_def_id(cdata, did));
-        result = Some(trait_ref);
-        break;
+        results.push(trait_ref);
     };
-    result
+    results
 }
 
 pub fn get_impl_method(intr: @ident_interner, cdata: cmd, id: ast::node_id,

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

@@ -2228,8 +2228,7 @@ pub fn register_fn_fuller(ccx: @CrateContext,
         mangle_exported_name(ccx, /*bad*/copy path, node_type)
     };
 
-    // XXX: Bad copy.
-    let llfn: ValueRef = decl_fn(ccx.llmod, copy ps, cc, llfty);
+    let llfn: ValueRef = decl_fn(ccx.llmod, ps, cc, llfty);
     ccx.item_symbols.insert(node_id, ps);
 
     // FIXME #4404 android JNI hacks

branches/try2/src/librustc/middle/trans/meth.rs

@@ -795,11 +795,8 @@ pub fn make_impl_vtable(ccx: @CrateContext,
     let _icx = ccx.insn_ctxt("impl::make_impl_vtable");
     let tcx = ccx.tcx;
 
-    let trt_id = match ty::impl_trait_ref(tcx, impl_id) {
-        Some(t_id) => t_id.def_id,
-        None       => ccx.sess.bug("make_impl_vtable: don't know how to \
-                                    make a vtable for a type impl!")
-    };
+    // XXX: This should support multiple traits.
+    let trt_id = ty::impl_trait_refs(tcx, impl_id)[0].def_id;
 
     let has_tps =
         !ty::lookup_item_type(ccx.tcx, impl_id).generics.type_param_defs.is_empty();

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

@@ -3883,23 +3883,23 @@ pub fn trait_method_def_ids(cx: ctxt, id: ast::def_id) -> @~[def_id] {
         || @csearch::get_trait_method_def_ids(cx.cstore, id))
 }
 
-pub fn impl_trait_ref(cx: ctxt, id: ast::def_id) -> Option<@TraitRef> {
+pub fn impl_trait_refs(cx: ctxt, id: ast::def_id) -> ~[@TraitRef] {
     if id.crate == ast::local_crate {
-        debug!("(impl_trait_ref) searching for trait impl %?", id);
+        debug!("(impl_traits) searching for trait impl %?", id);
         match cx.items.find(&id.node) {
            Some(&ast_map::node_item(@ast::item {
                         node: ast::item_impl(_, opt_trait, _, _),
                         _},
                     _)) => {
                match opt_trait {
-                   Some(t) => Some(ty::node_id_to_trait_ref(cx, t.ref_id)),
-                   None => None
+                   Some(t) => ~[ty::node_id_to_trait_ref(cx, t.ref_id)],
+                   None => ~[]
                }
            }
-           _ => None
+           _ => ~[]
         }
     } else {
-        csearch::get_impl_trait(cx, id)
+        csearch::get_impl_traits(cx, id)
     }
 }
 

branches/try2/src/librustc/middle/typeck/check/vtable.rs

@@ -261,14 +261,24 @@ fn lookup_vtable(vcx: &VtableContext,
                         }
                         impls_seen.insert(im.did);
 
-                        // ty::impl_traits gives us the trait im implements,
-                        // if there is one (there's either zero or one).
+                        // ty::impl_traits gives us the list of all
+                        // traits that im implements. Again, usually
+                        // there's just one.
                         //
-                        // If foo implements a trait t, and if t is the
-                        // same trait as trait_ref, we need to
+                        // For example, if im represented the struct
+                        // in:
+                        //
+                        //   struct foo : baz<int>, bar, quux { ... }
+                        //
+                        // then ty::impl_traits would return
+                        //
+                        //   ~[baz<int>, bar, quux]
+                        //
+                        // For each of the traits foo implements, if
+                        // it's the same trait as trait_ref, we need to
                         // unify it with trait_ref in order to get all
                         // the ty vars sorted out.
-                        for ty::impl_trait_ref(tcx, im.did).each |&of_trait_ref|
+                        for ty::impl_trait_refs(tcx, im.did).each |&of_trait_ref|
                         {
                             if of_trait_ref.def_id != trait_ref.def_id { loop; }
 
@@ -446,12 +456,8 @@ fn connect_trait_tps(vcx: &VtableContext,
 {
     let tcx = vcx.tcx();
 
-    let impl_trait_ref = match ty::impl_trait_ref(tcx, impl_did) {
-        Some(t) => t,
-        None => vcx.tcx().sess.span_bug(location_info.span,
-                                  "connect_trait_tps invoked on a type impl")
-    };
-
+    // XXX: This should work for multiple traits.
+    let impl_trait_ref = ty::impl_trait_refs(tcx, impl_did)[0];
     let impl_trait_ref = (*impl_trait_ref).subst(tcx, impl_substs);
     relate_trait_refs(vcx, location_info, &impl_trait_ref, trait_ref);
 }

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

@@ -16,7 +16,7 @@
 
 
 use driver;
-use metadata::csearch::{each_path, get_impl_trait};
+use metadata::csearch::{each_path, get_impl_traits};
 use metadata::csearch::{get_impls_for_mod};
 use metadata::csearch;
 use metadata::cstore::{CStore, iter_crate_data};
@@ -898,13 +898,13 @@ pub impl CoherenceChecker {
 
             let self_type = lookup_item_type(self.crate_context.tcx,
                                              implementation.did);
-            let associated_traits = get_impl_trait(self.crate_context.tcx,
+            let associated_traits = get_impl_traits(self.crate_context.tcx,
                                                     implementation.did);
 
             // Do a sanity check to make sure that inherent methods have base
             // types.
 
-            if associated_traits.is_none() {
+            if associated_traits.len() == 0 {
                 match get_base_type_def_id(self.inference_context,
                                            dummy_sp(),
                                            self_type.ty) {
@@ -940,7 +940,7 @@ pub impl CoherenceChecker {
                 Some(base_type_def_id) => {
                     // inherent methods apply to `impl Type` but not
                     // `impl Trait for Type`:
-                    if associated_traits.is_none() {
+                    if associated_traits.len() == 0 {
                         self.add_inherent_method(base_type_def_id,
                                                  *implementation);
                     }