---

yaml
---
r: 65272
b: refs/heads/master
c: ac6c15a
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ff28bb7839a039641788436b21130ae2d378609b
+refs/heads/master: ac6c15aecea4bb9a328cf8f80e1cbb9f0104d98b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/libextra/arc.rs

@@ -107,7 +107,7 @@ pub impl<'self> Condvar<'self> {
  ****************************************************************************/
 
 /// An atomically reference counted wrapper for shared immutable state.
-pub struct ARC<T> { x: UnsafeAtomicRcBox<T> }
+struct ARC<T> { x: UnsafeAtomicRcBox<T> }
 
 /// Create an atomically reference counted wrapper.
 pub fn ARC<T:Const + Owned>(data: T) -> ARC<T> {
@@ -118,22 +118,29 @@ pub fn ARC<T:Const + Owned>(data: T) -> ARC<T> {
  * Access the underlying data in an atomically reference counted
  * wrapper.
  */
-pub impl<T:Const+Owned> ARC<T> {
-    fn get<'a>(&'a self) -> &'a T {
+pub fn get<'a, T:Const + Owned>(rc: &'a ARC<T>) -> &'a T {
+    rc.get()
+}
+
+impl<T:Const+Owned> ARC<T> {
+    pub fn get<'a>(&'a self) -> &'a T {
         unsafe { &*self.x.get_immut() }
     }
 }
-
 /**
  * Duplicate an atomically reference counted wrapper.
  *
  * The resulting two `arc` objects will point to the same underlying data
  * object. However, one of the `arc` objects can be sent to another task,
  * allowing them to share the underlying data.
  */
+pub fn clone<T:Const + Owned>(rc: &ARC<T>) -> ARC<T> {
+    ARC { x: rc.x.clone() }
+}
+
 impl<T:Const + Owned> Clone for ARC<T> {
     fn clone(&self) -> ARC<T> {
-        ARC { x: self.x.clone() }
+        clone(self)
     }
 }
 
@@ -505,31 +512,34 @@ pub impl<'self, T:Const + Owned> RWReadMode<'self, T> {
 #[cfg(test)]
 mod tests {
     use core::prelude::*;
-    use core::cell::Cell;
+
     use arc::*;
     use arc;
 
+    use core::cell::Cell;
+    use core::task;
+
     #[test]
     fn manually_share_arc() {
         let v = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-        let arc_v = ARC(v);
+        let arc_v = arc::ARC(v);
 
         let (p, c) = comm::stream();
 
         do task::spawn() || {
             let p = comm::PortSet::new();
             c.send(p.chan());
 
-            let arc_v : ARC<~[int]> = p.recv();
+            let arc_v = p.recv();
 
-            let v = copy (*arc_v.get());
+            let v = copy *arc::get::<~[int]>(&arc_v);
             assert_eq!(v[3], 4);
         };
 
         let c = p.recv();
-        c.send(arc_v.clone());
+        c.send(arc::clone(&arc_v));
 
-        assert_eq!(arc_v.get()[2], 3);
+        assert_eq!((*arc::get(&arc_v))[2], 3);
         assert_eq!(arc_v.get()[4], 5);
 
         info!(arc_v);

trunk/src/librustc/front/config.rs

@@ -136,8 +136,10 @@ fn fold_block(
 ) -> ast::blk_ {
     let filtered_stmts =
         b.stmts.filter_mapped(|a| filter_stmt(cx, *a));
+    let filtered_view_items =
+        b.view_items.filter_mapped(|a| filter_view_item(cx, *a));
     ast::blk_ {
-        view_items: /*bad*/copy b.view_items,
+        view_items: vec::map(filtered_view_items, |x| fld.fold_view_item(*x)),
         stmts: vec::map(filtered_stmts, |x| fld.fold_stmt(*x)),
         expr: b.expr.map(|x| fld.fold_expr(*x)),
         id: b.id,

trunk/src/test/bench/graph500-bfs.rs

@@ -1,6 +1,6 @@
 // xfail-pretty
 
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -234,7 +234,7 @@ fn pbfs(graph: &arc::ARC<graph>, key: node_id) -> bfs_result {
         black(node_id)
     };
 
-    let graph_vec = graph.get(); // FIXME #3387 requires this temp
+    let graph_vec = arc::get(graph); // FIXME #3387 requires this temp
     let mut colors = do vec::from_fn(graph_vec.len()) |i| {
         if i as node_id == key {
             gray(key)
@@ -266,13 +266,13 @@ fn pbfs(graph: &arc::ARC<graph>, key: node_id) -> bfs_result {
 
         let color = arc::ARC(colors);
 
-        let color_vec = color.get(); // FIXME #3387 requires this temp
+        let color_vec = arc::get(&color); // FIXME #3387 requires this temp
         colors = do par::mapi(*color_vec) {
-            let colors = color.clone();
-            let graph = graph.clone();
+            let colors = arc::clone(&color);
+            let graph = arc::clone(graph);
             let result: ~fn(x: uint, y: &color) -> color = |i, c| {
-                let colors = colors.get();
-                let graph = graph.get();
+                let colors = arc::get(&colors);
+                let graph = arc::get(&graph);
                 match *c {
                   white => {
                     let i = i as node_id;

trunk/src/test/compile-fail/no-capture-arc.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -18,11 +18,11 @@ fn main() {
     let arc_v = arc::ARC(v);
 
     do task::spawn() {
-        let v = arc_v.get();
+        let v = *arc::get(&arc_v);
         assert_eq!(v[3], 4);
     };
 
-    assert_eq!((arc_v.get())[2], 3);
+    assert_eq!((*arc::get(&arc_v))[2], 3);
 
     info!(arc_v);
 }

trunk/src/test/compile-fail/no-reuse-move-arc.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -16,11 +16,11 @@ fn main() {
     let arc_v = arc::ARC(v);
 
     do task::spawn() { //~ NOTE `arc_v` moved into closure environment here
-        let v = arc_v.get();
+        let v = *arc::get(&arc_v);
         assert_eq!(v[3], 4);
     };
 
-    assert_eq!((arc_v.get())[2], 3); //~ ERROR use of moved value: `arc_v`
+    assert!((*arc::get(&arc_v))[2] == 3); //~ ERROR use of moved value: `arc_v`
 
     info!(arc_v);
 }

trunk/src/test/run-pass/filter-block-view-items.rs

@@ -0,0 +1,15 @@
+// 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.
+
+fn main() {
+    // Make sure that this view item is filtered out because otherwise it would
+    // trigger a compilation error
+    #[cfg(not_present)] use foo = bar;
+}