---

yaml
---
r: 63519
b: refs/heads/snap-stage3
c: 31b4b53
h: refs/heads/master
i:
  63517: b83e5fd
  63515: 0eb72e7
  63511: 9b39475
  63503: 5978ba1
  63487: 70fb7a9
v: v3

Author: luqmana

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: b8b2d1e5b41fd3351049fbb54846b42aa9b189bd
+refs/heads/snap-stage3: 31b4b53797337a3750bcb63b19b78642816f76de
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/resolve.rs

@@ -1415,24 +1415,26 @@ impl Resolver {
                                            (ReducedGraphParent,
                                             vt<ReducedGraphParent>)) {
         let ident = variant.node.name;
-        let (child, _) = self.add_child(ident, parent, ForbidDuplicateValues,
-                                        variant.span);
-
-        let privacy;
-        match variant.node.vis {
-            public => privacy = Public,
-            private => privacy = Private,
-            inherited => privacy = parent_privacy
-        }
+
+        let privacy =
+            match variant.node.vis {
+                public    => Public,
+                private   => Private,
+                inherited => parent_privacy
+            };
 
         match variant.node.kind {
             tuple_variant_kind(_) => {
+                let (child, _) = self.add_child(ident, parent, ForbidDuplicateValues,
+                                                variant.span);
                 child.define_value(privacy,
                                    def_variant(item_id,
                                                local_def(variant.node.id)),
                                    variant.span);
             }
             struct_variant_kind(_) => {
+                let (child, _) = self.add_child(ident, parent, ForbidDuplicateTypesAndValues,
+                                                variant.span);
                 child.define_type(privacy,
                                   def_variant(item_id,
                                               local_def(variant.node.id)),

branches/snap-stage3/src/libstd/rand.rs

@@ -843,7 +843,7 @@ fn tls_rng_state(_v: @@mut IsaacRng) {}
  * `task_rng().gen::<int>()`.
  */
 #[inline]
-pub fn task_rng() -> @mut IsaacRng {
+pub fn task_rng() -> @@mut IsaacRng {
     let r : Option<@@mut IsaacRng>;
     unsafe {
         r = local_data::local_data_get(tls_rng_state);
@@ -853,18 +853,20 @@ pub fn task_rng() -> @mut IsaacRng {
             unsafe {
                 let rng = @@mut IsaacRng::new_seeded(seed());
                 local_data::local_data_set(tls_rng_state, rng);
-                *rng
+                rng
             }
         }
-        Some(rng) => *rng
+        Some(rng) => rng
     }
 }
 
 // Allow direct chaining with `task_rng`
-impl<R: Rng> Rng for @mut R {
+impl<R: Rng> Rng for @@mut R {
     #[inline]
     fn next(&mut self) -> u32 {
-        (**self).next()
+        match *self {
+            @@ref mut r => r.next()
+        }
     }
 }
 
@@ -874,7 +876,9 @@ impl<R: Rng> Rng for @mut R {
  */
 #[inline]
 pub fn random<T: Rand>() -> T {
-    task_rng().gen()
+    match *task_rng() {
+        @ref mut r => r.gen()
+    }
 }
 
 #[cfg(test)]