---

yaml
---
r: 112207
b: refs/heads/try
c: 02081e7
h: refs/heads/master
i:
  112205: 8de9695
  112203: 3f99f06
  112199: 9b87381
  112191: 724178f
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: a692e9b1234ff6573b0cfbc39394d9222eb38f81
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b5dd3f05fe95168b5569d0f519636149479eb6ac
-refs/heads/try: 37306c1d25a6bb8d1e96adaff6a360d6163b8f29
+refs/heads/try: 02081e7c41d5780ae59fd8e6f68193a8fe737ced
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/doc/complement-cheatsheet.md

@@ -29,7 +29,7 @@ let x: int = 42;
 let y: ~str = format!("{:t}", x);   // binary
 let y: ~str = format!("{:o}", x);   // octal
 let y: ~str = format!("{:x}", x);   // lowercase hexadecimal
-let y: ~str = format!("{:X}", x);   // uppercase hexidecimal
+let y: ~str = format!("{:X}", x);   // uppercase hexadecimal
 ~~~
 
 **String to int, in non-base-10**

branches/try/src/doc/guide-ffi.md

@@ -337,7 +337,7 @@ Besides classical synchronization mechanisms like mutexes, one possibility in
 Rust is to use channels (in `std::comm`) to forward data from the C thread
 that invoked the callback into a Rust task.
 
-If an asychronous callback targets a special object in the Rust address space
+If an asynchronous callback targets a special object in the Rust address space
 it is also absolutely necessary that no more callbacks are performed by the
 C library after the respective Rust object gets destroyed.
 This can be achieved by unregistering the callback in the object's

branches/try/src/doc/guide-lifetimes.md

@@ -561,7 +561,7 @@ points at a static constant).
 
 Lifetimes can be named and referenced. For example, the special lifetime
 `'static`, which does not go out of scope, can be used to create global
-variables and communicate between tasks (see the manual for usecases).
+variables and communicate between tasks (see the manual for use cases).
 
 ## Parameter Lifetimes
 

branches/try/src/doc/intro.md

@@ -226,7 +226,7 @@ Now here's the exciting part:
 because `numbers` is an owned type,
 when it is sent across the channel,
 it is actually *moved*,
-transfering ownership of `numbers` between tasks.
+transferring ownership of `numbers` between tasks.
 This ownership transfer is *very fast* -
 in this case simply copying a pointer -
 while also ensuring that the original owning task cannot create data races by continuing to read or write to `numbers` in parallel with the new owner.
@@ -318,7 +318,7 @@ fn main() {
 This is almost exactly the same,
 except that this time `numbers` is first put into an `Arc`.
 `Arc::new` creates the `Arc`,
-`.clone()` makes another `Arc` that referrs to the same contents.
+`.clone()` makes another `Arc` that refers to the same contents.
 So we clone the `Arc` for each task,
 send that clone down the channel,
 and then use it to print out a number.

branches/try/src/doc/rust.md

@@ -295,7 +295,7 @@ Raw string literals do not process any escapes. They start with the character
 `U+0022` (double-quote) character. The _raw string body_ is not defined in the
 EBNF grammar above: it can contain any sequence of Unicode characters and is
 terminated only by another `U+0022` (double-quote) character, followed by the
-same number of `U+0023` (`#`) characters that preceeded the opening `U+0022`
+same number of `U+0023` (`#`) characters that preceded the opening `U+0022`
 (double-quote) character.
 
 All Unicode characters contained in the raw string body represent themselves,
@@ -1214,6 +1214,22 @@ struct Cookie;
 let c = [Cookie, Cookie, Cookie, Cookie];
 ~~~~
 
+By using the `struct_inherit` feature gate, structures may use single inheritance. A Structure may only
+inherit from a single other structure, called the _super-struct_. The inheriting structure (sub-struct)
+acts as if all fields in the super-struct were present in the sub-struct. Fields declared in a sub-struct
+must not have the same name as any field in any (transitive) super-struct. All fields (both declared
+and inherited) must be specified in any initializers. Inheritance between structures does not give
+subtyping or coercion. The super-struct and sub-struct must be defined in the same crate. The super-struct
+must be declared using the `virtual` keyword.
+For example:
+
+~~~~ {.ignore}
+virtual struct Sup { x: int }
+struct Sub : Sup { y: int }
+let s = Sub {x: 10, y: 11};
+let sx = s.x;
+~~~~
+
 ### Enumerations
 
 An _enumeration_ is a simultaneous definition of a nominal [enumerated type](#enumerated-types) as well as a set of *constructors*,
@@ -2240,7 +2256,7 @@ fn main() {
 Certain aspects of Rust may be implemented in the compiler, but they're not
 necessarily ready for every-day use. These features are often of "prototype
 quality" or "almost production ready", but may not be stable enough to be
-considered a full-fleged language feature.
+considered a full-fledged language feature.
 
 For this reason, Rust recognizes a special crate-level attribute of the form:
 
@@ -3989,7 +4005,7 @@ dependencies will be used:
    could only be found in an `rlib` format. Remember that `staticlib` formats
    are always ignored by `rustc` for crate-linking purposes.
 
-2. If a static library is being produced, all upstream dependecies are
+2. If a static library is being produced, all upstream dependencies are
    required to be available in `rlib` formats. This requirement stems from the
    same reasons that a dynamic library must have all dynamic dependencies.
 

branches/try/src/librustc/front/config.rs

@@ -151,6 +151,8 @@ fn fold_struct(cx: &Context, def: &ast::StructDef) -> @ast::StructDef {
     @ast::StructDef {
         fields: fields.collect(),
         ctor_id: def.ctor_id,
+        super_struct: def.super_struct.clone(),
+        is_virtual: def.is_virtual,
     }
 }
 

branches/try/src/librustc/front/feature_gate.rs

@@ -55,6 +55,7 @@ static KNOWN_FEATURES: &'static [(&'static str, Status)] = &[
     ("default_type_params", Active),
     ("quote", Active),
     ("linkage", Active),
+    ("struct_inherit", Active),
 
     // These are used to test this portion of the compiler, they don't actually
     // mean anything
@@ -190,11 +191,22 @@ impl<'a> Visitor<()> for Context<'a> {
                 }
             }
 
-            ast::ItemStruct(..) => {
+            ast::ItemStruct(struct_definition, _) => {
                 if attr::contains_name(i.attrs.as_slice(), "simd") {
                     self.gate_feature("simd", i.span,
                                       "SIMD types are experimental and possibly buggy");
                 }
+                match struct_definition.super_struct {
+                    Some(ref path) => self.gate_feature("struct_inherit", path.span,
+                                                        "struct inheritance is experimental \
+                                                         and possibly buggy"),
+                    None => {}
+                }
+                if struct_definition.is_virtual {
+                    self.gate_feature("struct_inherit", i.span,
+                                      "struct inheritance (`virtual` keyword) is \
+                                       experimental and possibly buggy");
+                }
             }
 
             _ => {}

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

@@ -92,6 +92,7 @@ pub static tag_path_len: uint = 0x25;
 pub static tag_path_elem_mod: uint = 0x26;
 pub static tag_path_elem_name: uint = 0x27;
 pub static tag_item_field: uint = 0x28;
+pub static tag_item_field_origin: uint = 0x29;
 
 pub static tag_item_variances: uint = 0x2a;
 /*
@@ -102,43 +103,43 @@ pub static tag_item_variances: uint = 0x2a;
   both, tag_item_trait_method and tag_item_impl_method have to be two
   different tags.
  */
-pub static tag_item_impl_method: uint = 0x2c;
-pub static tag_item_trait_method_explicit_self: uint = 0x2d;
+pub static tag_item_impl_method: uint = 0x30;
+pub static tag_item_trait_method_explicit_self: uint = 0x31;
 
 
 // Reexports are found within module tags. Each reexport contains def_ids
 // and names.
-pub static tag_items_data_item_reexport: uint = 0x2f;
-pub static tag_items_data_item_reexport_def_id: uint = 0x30;
-pub static tag_items_data_item_reexport_name: uint = 0x31;
+pub static tag_items_data_item_reexport: uint = 0x38;
+pub static tag_items_data_item_reexport_def_id: uint = 0x39;
+pub static tag_items_data_item_reexport_name: uint = 0x3a;
 
 // used to encode crate_ctxt side tables
 #[deriving(Eq)]
 #[repr(uint)]
-pub enum astencode_tag { // Reserves 0x32 -- 0x45
-    tag_ast = 0x32,
-
-    tag_tree = 0x33,
-
-    tag_id_range = 0x34,
-
-    tag_table = 0x35,
-    tag_table_id = 0x36,
-    tag_table_val = 0x37,
-    tag_table_def = 0x38,
-    tag_table_node_type = 0x39,
-    tag_table_node_type_subst = 0x3a,
-    tag_table_freevars = 0x3b,
-    tag_table_tcache = 0x3c,
-    tag_table_param_defs = 0x3d,
-    tag_table_mutbl = 0x3e,
-    tag_table_last_use = 0x3f,
-    tag_table_spill = 0x40,
-    tag_table_method_map = 0x41,
-    tag_table_vtable_map = 0x42,
-    tag_table_adjustments = 0x43,
-    tag_table_moves_map = 0x44,
-    tag_table_capture_map = 0x45
+pub enum astencode_tag { // Reserves 0x40 -- 0x5f
+    tag_ast = 0x40,
+
+    tag_tree = 0x41,
+
+    tag_id_range = 0x42,
+
+    tag_table = 0x43,
+    tag_table_id = 0x44,
+    tag_table_val = 0x45,
+    tag_table_def = 0x46,
+    tag_table_node_type = 0x47,
+    tag_table_node_type_subst = 0x48,
+    tag_table_freevars = 0x49,
+    tag_table_tcache = 0x4a,
+    tag_table_param_defs = 0x4b,
+    tag_table_mutbl = 0x4c,
+    tag_table_last_use = 0x4d,
+    tag_table_spill = 0x4e,
+    tag_table_method_map = 0x4f,
+    tag_table_vtable_map = 0x50,
+    tag_table_adjustments = 0x51,
+    tag_table_moves_map = 0x52,
+    tag_table_capture_map = 0x53
 }
 static first_astencode_tag: uint = tag_ast as uint;
 static last_astencode_tag: uint = tag_table_capture_map as uint;
@@ -151,9 +152,9 @@ impl astencode_tag {
     }
 }
 
-pub static tag_item_trait_method_sort: uint = 0x46;
+pub static tag_item_trait_method_sort: uint = 0x60;
 
-pub static tag_item_impl_type_basename: uint = 0x47;
+pub static tag_item_impl_type_basename: uint = 0x61;
 
 // Language items are a top-level directory (for speed). Hierarchy:
 //
@@ -162,42 +163,42 @@ pub static tag_item_impl_type_basename: uint = 0x47;
 //   - tag_lang_items_item_id: u32
 //   - tag_lang_items_item_node_id: u32
 
-pub static tag_lang_items: uint = 0x48;
-pub static tag_lang_items_item: uint = 0x49;
-pub static tag_lang_items_item_id: uint = 0x4a;
-pub static tag_lang_items_item_node_id: uint = 0x4b;
+pub static tag_lang_items: uint = 0x70;
+pub static tag_lang_items_item: uint = 0x71;
+pub static tag_lang_items_item_id: uint = 0x72;
+pub static tag_lang_items_item_node_id: uint = 0x73;
 
-pub static tag_item_unnamed_field: uint = 0x4c;
-pub static tag_items_data_item_visibility: uint = 0x4e;
+pub static tag_item_unnamed_field: uint = 0x74;
+pub static tag_items_data_item_visibility: uint = 0x76;
 
-pub static tag_item_method_tps: uint = 0x51;
-pub static tag_item_method_fty: uint = 0x52;
+pub static tag_item_method_tps: uint = 0x79;
+pub static tag_item_method_fty: uint = 0x7a;
 
-pub static tag_mod_child: uint = 0x53;
-pub static tag_misc_info: uint = 0x54;
-pub static tag_misc_info_crate_items: uint = 0x55;
+pub static tag_mod_child: uint = 0x7b;
+pub static tag_misc_info: uint = 0x7c;
+pub static tag_misc_info_crate_items: uint = 0x7d;
 
-pub static tag_item_method_provided_source: uint = 0x56;
-pub static tag_item_impl_vtables: uint = 0x57;
+pub static tag_item_method_provided_source: uint = 0x7e;
+pub static tag_item_impl_vtables: uint = 0x7f;
 
-pub static tag_impls: uint = 0x58;
-pub static tag_impls_impl: uint = 0x59;
+pub static tag_impls: uint = 0x80;
+pub static tag_impls_impl: uint = 0x81;
 
-pub static tag_items_data_item_inherent_impl: uint = 0x5a;
-pub static tag_items_data_item_extension_impl: uint = 0x5b;
+pub static tag_items_data_item_inherent_impl: uint = 0x82;
+pub static tag_items_data_item_extension_impl: uint = 0x83;
 
-pub static tag_region_param_def: uint = 0x5c;
-pub static tag_region_param_def_ident: uint = 0x5d;
-pub static tag_region_param_def_def_id: uint = 0x5e;
+pub static tag_region_param_def: uint = 0x84;
+pub static tag_region_param_def_ident: uint = 0x85;
+pub static tag_region_param_def_def_id: uint = 0x86;
 
-pub static tag_native_libraries: uint = 0x5f;
-pub static tag_native_libraries_lib: uint = 0x60;
-pub static tag_native_libraries_name: uint = 0x61;
-pub static tag_native_libraries_kind: uint = 0x62;
+pub static tag_native_libraries: uint = 0x87;
+pub static tag_native_libraries_lib: uint = 0x88;
+pub static tag_native_libraries_name: uint = 0x89;
+pub static tag_native_libraries_kind: uint = 0x8a;
 
-pub static tag_macro_registrar_fn: uint = 0x63;
-pub static tag_exported_macros: uint = 0x64;
-pub static tag_macro_def: uint = 0x65;
+pub static tag_macro_registrar_fn: uint = 0x8b;
+pub static tag_exported_macros: uint = 0x8c;
+pub static tag_macro_def: uint = 0x8d;
 
 #[deriving(Clone, Show)]
 pub struct LinkMeta {

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

@@ -975,21 +975,27 @@ pub fn get_struct_fields(intr: Rc<IdentInterner>, cdata: Cmd, id: ast::NodeId)
             // FIXME #6993: name should be of type Name, not Ident
             let name = item_name(&*intr, an_item);
             let did = item_def_id(an_item, cdata);
+            let tagdoc = reader::get_doc(an_item, tag_item_field_origin);
+            let origin_id =  translate_def_id(cdata, reader::with_doc_data(tagdoc, parse_def_id));
             result.push(ty::field_ty {
                 name: name.name,
-                id: did, vis:
-                struct_field_family_to_visibility(f),
+                id: did,
+                vis: struct_field_family_to_visibility(f),
+                origin: origin_id,
             });
         }
         true
     });
     reader::tagged_docs(item, tag_item_unnamed_field, |an_item| {
         let did = item_def_id(an_item, cdata);
+        let tagdoc = reader::get_doc(an_item, tag_item_field_origin);
         let f = item_family(an_item);
+        let origin_id =  translate_def_id(cdata, reader::with_doc_data(tagdoc, parse_def_id));
         result.push(ty::field_ty {
             name: special_idents::unnamed_field.name,
             id: did,
             vis: struct_field_family_to_visibility(f),
+            origin: origin_id,
         });
         true
     });