---

yaml
---
r: 22570
b: refs/heads/master
c: d809336
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 053bdcac2d1b6872fe54b6c928910a3eba8eca67
+refs/heads/master: d809336d0f5f4efa11336878736aeefe1fbae895
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/front/intrinsic.rs

@@ -46,7 +46,7 @@ mod intrinsic {
         fn visit_estr_box() -> bool;
         fn visit_estr_uniq() -> bool;
         fn visit_estr_slice() -> bool;
-        fn visit_estr_fixed(sz: uint) -> bool;
+        fn visit_estr_fixed(n: uint, sz: uint, align: uint) -> bool;
 
         fn visit_box(mtbl: uint, inner: *tydesc) -> bool;
         fn visit_uniq(mtbl: uint, inner: *tydesc) -> bool;
@@ -58,9 +58,8 @@ mod intrinsic {
         fn visit_evec_box(mtbl: uint, inner: *tydesc) -> bool;
         fn visit_evec_uniq(mtbl: uint, inner: *tydesc) -> bool;
         fn visit_evec_slice(mtbl: uint, inner: *tydesc) -> bool;
-        fn visit_evec_fixed(n: uint, mtbl: uint,
-                            sz: uint, align: uint,
-                            inner: *tydesc) -> bool;
+        fn visit_evec_fixed(n: uint, sz: uint, align: uint,
+                            mtbl: uint, inner: *tydesc) -> bool;
 
         fn visit_enter_rec(n_fields: uint,
                            sz: uint, align: uint) -> bool;

trunk/src/test/run-pass/issue-2930.rs

@@ -1,7 +1,3 @@
-// xfail-pretty
-// xfail-win32
-// xfail-test
-
 // Generated from pipe compiler
 mod stream {
     fn init<T: send>() -> (client::stream<T>, server::stream<T>) {

trunk/src/test/run-pass/reflect-visit-data.rs

@@ -199,9 +199,11 @@ impl ptr_visitor<V: ty_visitor movable_ptr>
         true
     }
 
-    fn visit_estr_fixed(sz: uint) -> bool {
-        self.align_to::<u8>();
-        if ! self.inner.visit_estr_fixed(sz) { ret false; }
+    fn visit_estr_fixed(n: uint,
+                        sz: uint,
+                        align: uint) -> bool {
+        self.align(align);
+        if ! self.inner.visit_estr_fixed(n, sz, align) { ret false; }
         self.bump(sz);
         true
     }
@@ -272,11 +274,10 @@ impl ptr_visitor<V: ty_visitor movable_ptr>
         true
     }
 
-    fn visit_evec_fixed(mtbl: uint, n: uint,
-                        sz: uint, align: uint,
-                        inner: *tydesc) -> bool {
+    fn visit_evec_fixed(n: uint, sz: uint, align: uint,
+                        mtbl: uint, inner: *tydesc) -> bool {
         self.align(align);
-        if ! self.inner.visit_evec_fixed(mtbl, n, sz, align, inner) {
+        if ! self.inner.visit_evec_fixed(n, sz, align, mtbl, inner) {
             ret false;
         }
         self.bump(sz);
@@ -522,7 +523,8 @@ impl of ty_visitor for my_visitor {
     fn visit_estr_box() -> bool { true }
     fn visit_estr_uniq() -> bool { true }
     fn visit_estr_slice() -> bool { true }
-    fn visit_estr_fixed(_sz: uint) -> bool { true }
+    fn visit_estr_fixed(_n: uint, _sz: uint,
+                        _align: uint) -> bool { true }
 
     fn visit_box(_mtbl: uint, _inner: *tydesc) -> bool { true }
     fn visit_uniq(_mtbl: uint, _inner: *tydesc) -> bool { true }
@@ -534,9 +536,8 @@ impl of ty_visitor for my_visitor {
     fn visit_evec_box(_mtbl: uint, _inner: *tydesc) -> bool { true }
     fn visit_evec_uniq(_mtbl: uint, _inner: *tydesc) -> bool { true }
     fn visit_evec_slice(_mtbl: uint, _inner: *tydesc) -> bool { true }
-    fn visit_evec_fixed(_n: uint, _mtbl: uint,
-                        _sz: uint, _align: uint,
-                        _inner: *tydesc) -> bool { true }
+    fn visit_evec_fixed(_n: uint, _sz: uint, _align: uint,
+                        _mtbl: uint, _inner: *tydesc) -> bool { true }
 
     fn visit_enter_rec(_n_fields: uint,
                        _sz: uint, _align: uint) -> bool { true }

trunk/src/test/run-pass/reflect-visit-type.rs

@@ -54,7 +54,8 @@ impl of ty_visitor for my_visitor {
     fn visit_estr_box() -> bool { true }
     fn visit_estr_uniq() -> bool { true }
     fn visit_estr_slice() -> bool { true }
-    fn visit_estr_fixed(_sz: uint) -> bool { true }
+    fn visit_estr_fixed(_sz: uint, _sz: uint,
+                        _align: uint) -> bool { true }
 
     fn visit_box(_mtbl: uint, _inner: *tydesc) -> bool { true }
     fn visit_uniq(_mtbl: uint, _inner: *tydesc) -> bool { true }
@@ -71,9 +72,8 @@ impl of ty_visitor for my_visitor {
     fn visit_evec_box(_mtbl: uint, _inner: *tydesc) -> bool { true }
     fn visit_evec_uniq(_mtbl: uint, _inner: *tydesc) -> bool { true }
     fn visit_evec_slice(_mtbl: uint, _inner: *tydesc) -> bool { true }
-    fn visit_evec_fixed(_n: uint, _mtbl: uint,
-                        _sz: uint, _align: uint,
-                        _inner: *tydesc) -> bool { true }
+    fn visit_evec_fixed(_n: uint, _sz: uint, _align: uint,
+                        _mtbl: uint, _inner: *tydesc) -> bool { true }
 
     fn visit_enter_rec(_n_fields: uint,
                        _sz: uint, _align: uint) -> bool { true }