---

yaml
---
r: 58025
b: refs/heads/incoming
c: dc5df61
h: refs/heads/master
i:
  58023: 7456248
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
+refs/heads/incoming: dc5df61bc1914224d50d92cdd5599b6337ac68f2
 refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/back/abi.rs

@@ -57,13 +57,6 @@ pub static n_tydesc_fields: uint = 8u;
 pub static fn_field_code: uint = 0u;
 pub static fn_field_box: uint = 1u;
 
-// The three fields of a trait object/trait instance: vtable, box, and type
-// description.
-pub static trt_field_vtable: uint = 0u;
-pub static trt_field_box: uint = 1u;
-// This field is only present in unique trait objects, so it comes last.
-pub static trt_field_tydesc: uint = 2u;
-
 pub static vec_elt_fill: uint = 0u;
 
 pub static vec_elt_alloc: uint = 1u;

branches/incoming/src/librustc/driver/driver.rs

@@ -653,7 +653,7 @@ pub fn build_session_options(binary: @~str,
 
     let linker_args = getopts::opt_strs(matches, ~"link-args").flat_map( |a| {
         let mut args = ~[];
-        for str::each_split_char(*a, ' ') |arg| {
+        for str::each_split_char(*a, ',') |arg| {
             args.push(str::from_slice(arg));
         }
         args
@@ -760,7 +760,7 @@ pub fn optgroups() -> ~[getopts::groups::OptGroup] {
   optmulti("L", "",   "Add a directory to the library search path",
                               "PATH"),
   optflag("",  "lib", "Compile a library crate"),
-  optmulti("",  "link-args", "FLAGS is a space-separated list of flags
+  optmulti("",  "link-args", "FLAGS is a comma-separated list of flags
                             passed to the linker", "FLAGS"),
   optflag("",  "ls",  "List the symbols defined by a library crate"),
   optflag("", "no-trans",

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

@@ -272,12 +272,21 @@ fn item_ty_param_defs(item: ebml::Doc, tcx: ty::ctxt, cdata: cmd,
     @bounds
 }
 
+#[cfg(stage0)]
 fn item_ty_region_param(item: ebml::Doc) -> Option<ty::region_variance> {
     reader::maybe_get_doc(item, tag_region_param).map(|doc| {
         Decodable::decode(&reader::Decoder(*doc))
     })
 }
 
+#[cfg(not(stage0))]
+fn item_ty_region_param(item: ebml::Doc) -> Option<ty::region_variance> {
+    reader::maybe_get_doc(item, tag_region_param).map(|doc| {
+        let mut decoder = reader::Decoder(*doc);
+        Decodable::decode(&mut decoder)
+    })
+}
+
 fn item_ty_param_count(item: ebml::Doc) -> uint {
     let mut n = 0u;
     reader::tagged_docs(item, tag_items_data_item_ty_param_bounds,