---

yaml
---
r: 94133
b: refs/heads/try
c: 09db61f
h: refs/heads/master
i:
  94131: 704e887
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: 4d688e8214e2589ae56aca2eb720f2eb68492ea2
+refs/heads/try: 09db61fb4f2ab880726dc29624ce66b41f1eb341
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

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

@@ -1140,6 +1140,8 @@ fn encode_info_for_item(ecx: &EncodeContext,
         encode_ty_type_param_defs(ebml_w, ecx,
                                   trait_def.generics.type_param_defs,
                                   tag_items_data_item_ty_param_bounds);
+        encode_region_param_defs(ebml_w, ecx,
+                                 trait_def.generics.region_param_defs);
         encode_trait_ref(ebml_w, ecx, trait_def.trait_ref, tag_item_trait_ref);
         encode_name(ecx, ebml_w, item.ident);
         encode_attributes(ebml_w, item.attrs);

branches/try/src/libsyntax/ast.rs

@@ -254,9 +254,14 @@ pub enum Def {
               NodeId,  // expr node that creates the closure
               NodeId), // id for the block/body of the closure expr
 
-    /// Note that if it's a tuple struct's definition, the node id
-    /// of the DefId refers to the struct_def.ctor_id (whereas normally it
-    /// refers to the item definition's id).
+    /// Note that if it's a tuple struct's definition, the node id of the DefId
+    /// may either refer to the item definition's id or the struct_def.ctor_id.
+    ///
+    /// The cases that I have encountered so far are (this is not exhaustive):
+    /// - If it's a ty_path referring to some tuple struct, then DefMap maps
+    ///   it to a def whose id is the item definition's id.
+    /// - If it's an ExprPath referring to some tuple struct, then DefMap maps
+    ///   it to a def whose id is the struct_def.ctor_id.
     DefStruct(DefId),
     DefTyParamBinder(NodeId), /* struct, impl or trait with ty params */
     DefRegion(NodeId),

branches/try/src/test/auxiliary/xcrate-trait-lifetime-param.rs

@@ -0,0 +1,13 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+pub trait FromBuf<'a> {
+    fn from_buf(&'a [u8]) -> Self;
+}

branches/try/src/test/run-pass/xcrate-trait-lifetime-param.rs

@@ -0,0 +1,26 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// xfail-fast
+// aux-build:xcrate-trait-lifetime-param.rs
+
+extern mod other(name = "xcrate-trait-lifetime-param");
+
+struct Reader<'a> {
+    b : &'a [u8]
+}
+
+impl <'a> other::FromBuf<'a> for Reader<'a> {
+    fn from_buf(b : &'a [u8]) -> Reader<'a> {
+        Reader { b : b }
+    }
+}
+
+pub fn main () {}