Remove use of capture clause #4965

rust-lang · Feb 17, 2013 · 1f4c758 · 1f4c758
1 parent 945ac42
commit 1f4c758
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/src/librustdoc/text_pass.rs b/src/librustdoc/text_pass.rs
@@ -76,7 +76,7 @@ fn apply_to_sections(
     op: NominalOp<Op>,
     sections: ~[doc::Section]
 ) -> ~[doc::Section] {
-    sections.map(|section, copy op| doc::Section {
+    sections.map(|section| doc::Section {
         header: (op.op)(copy section.header),
         body: (op.op)(copy section.body)
     })
@@ -89,7 +89,7 @@ fn fold_enum(
     let fold_copy = copy *fold;
 
     doc::EnumDoc {
-        variants: do doc.variants.map |variant, copy fold_copy| {
+        variants: do doc.variants.map |variant| {
             doc::VariantDoc {
                 desc: maybe_apply_op(copy fold_copy.ctxt, &variant.desc),
                 .. copy *variant

diff --git a/src/librustdoc/tystr_pass.rs b/src/librustdoc/tystr_pass.rs
@@ -137,7 +137,7 @@ fn fold_enum(
         variants: do vec::map(doc.variants) |variant| {
             let sig = {
                 let variant = copy *variant;
-                do astsrv::exec(srv.clone()) |copy variant, ctxt| {
+                do astsrv::exec(srv.clone()) |ctxt| {
                     match ctxt.ast_map.get(&doc_id) {
                         ast_map::node_item(@ast::item {
                             node: ast::item_enum(ref enum_definition, _), _
@@ -198,7 +198,7 @@ fn get_method_sig(
     item_id: doc::AstId,
     method_name: ~str
 ) -> Option<~str> {
-    do astsrv::exec(srv) |copy method_name, ctxt| {
+    do astsrv::exec(srv) |ctxt| {
         match ctxt.ast_map.get(&item_id) {
           ast_map::node_item(@ast::item {
             node: ast::item_trait(_, _, ref methods), _

diff --git a/src/librusti/rusti.rc b/src/librusti/rusti.rc
@@ -368,7 +368,7 @@ fn run_line(repl: &mut Repl, in: io::Reader, out: io::Writer, line: ~str)
     }
 
     let r = *repl;
-    let result = do task::try |copy r| {
+    let result = do task::try {
         run(r, line)
     };
 

diff --git a/src/libstd/future.rs b/src/libstd/future.rs
@@ -202,7 +202,7 @@ pub mod test {
     #[test]
     pub fn test_sendable_future() {
         let expected = ~"schlorf";
-        let f = do spawn |copy expected| { copy expected };
+        let f = do spawn { copy expected };
         do task::spawn || {
             let actual = f.get();
             assert actual == expected;

diff --git a/src/test/auxiliary/cci_capture_clause.rs b/src/test/auxiliary/cci_capture_clause.rs
@@ -12,7 +12,7 @@ use core::pipes::*;
 
 pub fn foo<T: Owned Copy>(x: T) -> Port<T> {
     let (p, c) = stream();
-    do task::spawn() |copy x| {
+    do task::spawn() {
         c.send(x);
     }
     p

diff --git a/src/test/run-pass/capture_nil.rs b/src/test/run-pass/capture_nil.rs
@@ -28,7 +28,7 @@ use core::pipes::*;
 
 fn foo(&&x: ()) -> Port<()> {
     let (p, c) = stream::<()>();
-    do task::spawn() |copy x| {
+    do task::spawn() {
         c.send(x);
     }
     p

diff --git a/src/test/run-pass/issue-3609.rs b/src/test/run-pass/issue-3609.rs
@@ -12,7 +12,6 @@ enum Msg
 
 fn foo(name: ~str, samples_chan: Chan<Msg>) {
     do task::spawn
-    |copy name|
     {
         let callback: SamplesFn =
             |buffer|