Skip to content

Commit cfe08b7

Browse files
committed
Rollup merge of #24806 - FuGangqiang:doc, r=Manishearth
2 parents 4f1bbc2 + 46462c7 commit cfe08b7

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/doc/trpl/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
% Getting Started
22

33
This first section of the book will get you going with Rust and its tooling.
4-
First, we’ll install Rust. Then: the classic ‘Hello World’ program. Finally,
4+
First, we’ll install Rust. Then, the classic ‘Hello World’ program. Finally,
55
we’ll talk about Cargo, Rust’s build system and package manager.

src/doc/trpl/glossary.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ In the example above `x` and `y` have arity 2. `z` has arity 3.
1919

2020
When a compiler is compiling your program, it does a number of different
2121
things. One of the things that it does is turn the text of your program into an
22-
'abstract syntax tree,' or 'AST.' This tree is a representation of the
22+
abstract syntax tree’, orAST’. This tree is a representation of the
2323
structure of your program. For example, `2 + 3` can be turned into a tree:
2424

2525
```text

src/doc/trpl/primitive-types.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ let y = 1.0; // y has type f64
6262
Here’s a list of the different numeric types, with links to their documentation
6363
in the standard library:
6464

65+
* [i8](../std/primitive.i8.html)
6566
* [i16](../std/primitive.i16.html)
6667
* [i32](../std/primitive.i32.html)
6768
* [i64](../std/primitive.i64.html)
68-
* [i8](../std/primitive.i8.html)
69+
* [u8](../std/primitive.u8.html)
6970
* [u16](../std/primitive.u16.html)
7071
* [u32](../std/primitive.u32.html)
7172
* [u64](../std/primitive.u64.html)
72-
* [u8](../std/primitive.u8.html)
7373
* [isize](../std/primitive.isize.html)
7474
* [usize](../std/primitive.usize.html)
7575
* [f32](../std/primitive.f32.html)
@@ -82,12 +82,12 @@ Let’s go over them by category:
8282
Integer types come in two varieties: signed and unsigned. To understand the
8383
difference, let’s consider a number with four bits of size. A signed, four-bit
8484
number would let you store numbers from `-8` to `+7`. Signed numbers use
85-
two’s compliment representation. An unsigned four bit number, since it does
85+
two’s compliment representation. An unsigned four bit number, since it does
8686
not need to store negatives, can store values from `0` to `+15`.
8787

8888
Unsigned types use a `u` for their category, and signed types use `i`. The `i`
8989
is for ‘integer’. So `u8` is an eight-bit unsigned number, and `i8` is an
90-
eight-bit signed number.
90+
eight-bit signed number.
9191

9292
## Fixed size types
9393

@@ -103,7 +103,7 @@ and unsigned varieties. This makes for two types: `isize` and `usize`.
103103

104104
## Floating-point types
105105

106-
Rust also two floating point types: `f32` and `f64`. These correspond to
106+
Rust also has two floating point types: `f32` and `f64`. These correspond to
107107
IEEE-754 single and double precision numbers.
108108

109109
# Arrays
@@ -241,8 +241,8 @@ println!("x is {}", x);
241241
Remember [before][let] when I said the left-hand side of a `let` statement was more
242242
powerful than just assigning a binding? Here we are. We can put a pattern on
243243
the left-hand side of the `let`, and if it matches up to the right-hand side,
244-
we can assign multiple bindings at once. In this case, `let` "destructures,"
245-
or "breaks up," the tuple, and assigns the bits to three bindings.
244+
we can assign multiple bindings at once. In this case, `let` destructures
245+
or breaks up the tuple, and assigns the bits to three bindings.
246246

247247
[let]: variable-bindings.html
248248

src/doc/trpl/variable-bindings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
% Variable Bindings
22

3-
Vitually every non-Hello World’ Rust program uses *variable bindings*. They
3+
Virtually every non-Hello World’Rust program uses *variable bindings*. They
44
look like this:
55

66
```rust

0 commit comments

Comments
 (0)