Skip to content

Commit 7900511

Browse files
committed
---
yaml --- r: 128987 b: refs/heads/try c: b0931a0 h: refs/heads/master i: 128985: 4682017 128983: 65731b8 v: v3
1 parent 8fbbe97 commit 7900511

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1215
-2467
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 07d86b46a949a94223da714e35b343243e4ecce4
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a86d9ad15e339ab343a12513f9c90556f677b9ca
5-
refs/heads/try: 6de570f8173fb35ad52c4e5b90bae74d282d28ad
5+
refs/heads/try: b0931a0a0f8ff10befa1e3037b670badca52a65f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/doc/complement-design-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
% The Rust Design FAQ
22

3-
This document describes decisions that were arrived at after lengthy discussion and
3+
This document describes decisions were arrived at after lengthy discussion and
44
experimenting with alternatives. Please do not propose reversing them unless
55
you have a new, extremely compelling argument. Note that this document
66
specifically talks about the *language* and not any library or implementation.

branches/try/src/doc/guide-pointers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ let z = &x;
332332
Mutable ones, however, are not:
333333

334334
```{rust,ignore}
335-
let mut x = 5i;
335+
let x = 5i;
336336
let y = &mut x;
337337
let z = &mut x; // error: cannot borrow `x` as mutable more than once at a time
338338
```

branches/try/src/doc/guide-tasks.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,10 @@ closure in the new task.
8989
fn print_message() { println!("I am running in a different task!"); }
9090
spawn(print_message);
9191
92-
// Alternatively, use a `proc` expression instead of a named function.
92+
// Print something profound in a different task using a `proc` expression
9393
// The `proc` expression evaluates to an (unnamed) owned closure.
9494
// That closure will call `println!(...)` when the spawned task runs.
95+
9596
spawn(proc() println!("I am also running in a different task!") );
9697
~~~~
9798

@@ -351,14 +352,14 @@ fn main() {
351352

352353
The function `pnorm` performs a simple computation on the vector (it computes the sum of its items
353354
at the power given as argument and takes the inverse power of this value). The Arc on the vector is
354-
created by the line:
355+
created by the line
355356

356357
~~~
357358
# use std::rand;
358359
# use std::sync::Arc;
359360
# fn main() {
360361
# let numbers = Vec::from_fn(1000000, |_| rand::random::<f64>());
361-
let numbers_arc = Arc::new(numbers);
362+
let numbers_arc=Arc::new(numbers);
362363
# }
363364
~~~
364365

branches/try/src/doc/guide-unsafe.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ possible in two ways: the `#[start]` attribute, or overriding the
446446
default shim for the C `main` function with your own.
447447

448448
The function marked `#[start]` is passed the command line parameters
449-
in the same format as C:
449+
in the same format as a C:
450450

451451
```
452452
#![no_std]
@@ -593,7 +593,7 @@ standard library itself.
593593
# Interacting with the compiler internals
594594

595595
> **Note**: this section is specific to the `rustc` compiler; these
596-
> parts of the language may never be fully specified and so details may
596+
> parts of the language may never be full specified and so details may
597597
> differ wildly between implementations (and even versions of `rustc`
598598
> itself).
599599
>

0 commit comments

Comments
 (0)