Skip to content

Commit e485d29

Browse files
committed
Improve example in the intro.
Thank you @bluss for the suggested implementation. Fixes #20844
1 parent b21a6da commit e485d29

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

src/doc/intro.md

+11-10
Original file line numberDiff line numberDiff line change
@@ -392,20 +392,21 @@ Here's an example of a concurrent Rust program:
392392
use std::thread::Thread;
393393
394394
fn main() {
395-
for _ in range(0u, 10u) {
396-
Thread::spawn(move || {
395+
let guards: Vec<_> = (0..10).map(|_| {
396+
Thread::scoped(|| {
397397
println!("Hello, world!");
398-
});
399-
}
398+
})
399+
}).collect();
400400
}
401401
```
402402
403-
This program creates ten threads, who all print `Hello, world!`. The
404-
`spawn` function takes one argument, a closure, indicated by the
405-
double bars `||`. (The `move` keyword indicates that the closure takes
406-
ownership of any data it uses; we'll have more on the significance of
407-
this shortly.) This closure is executed in a new thread created by
408-
`spawn`.
403+
This program creates ten threads, which all print `Hello, world!`. The `scoped`
404+
function takes one argument, a closure, indicated by the double bars `||`. This
405+
closure is executed in a new thread created by `scoped`. The method is called
406+
`scoped` because it returns a 'join guard', which will automatically join the
407+
child thread when it goes out of scope. Because we `collect` these guards into
408+
a `Vec<T>`, and that vector goes out of scope at the end of our program, our
409+
program will wait for every thread to finish before finishing.
409410
410411
One common form of problem in concurrent programs is a 'data race.'
411412
This occurs when two different threads attempt to access the same

0 commit comments

Comments
 (0)