Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
b60c3e2
Closes #15919
bombless Apr 30, 2015
4c8b813
Closes #15919
bombless Apr 30, 2015
9b3d315
std: Update crate docs
brson May 8, 2015
4b52059
Add error explanations for E0049, E0050, E0069, E0106, E0107, E0166.
May 11, 2015
4fee8d3
Add error explanation for E0066.
May 12, 2015
c3dc769
Add error explanation for E0322.
May 12, 2015
71f6ed8
Remove comment description of E0234.
May 12, 2015
cbeda68
Add error explanation for E0201.
May 12, 2015
46753da
Record correct span for static mut items
GSam May 12, 2015
a22b327
book: typo fixes, wording improvements.
wheals May 12, 2015
6f3701d
readme: Rework the arch support matrix
richo May 12, 2015
6ebba71
doc: Address feedback
brson May 12, 2015
33a30f2
Improve error explanations for E0049, E0050, E0166.
May 12, 2015
5c77f0d
Remove extended explanation of lifetime elision from E0106.
May 12, 2015
0ad15bb
TRPL: release channels
steveklabnik May 7, 2015
9a3e98b
TRPL: Drop
steveklabnik May 11, 2015
fc6372e
TRPL: Rust inside other languages
steveklabnik May 12, 2015
2ba6169
TRPL: dining philosophers
steveklabnik May 11, 2015
457aed7
trpl: move tuple-structs.md into structs.md
geofft May 12, 2015
797d8e2
trpl/structs: Document unit-like structs
geofft May 12, 2015
8d50216
trpl/enums: Rewrite
geofft May 12, 2015
f59f41e
trpl/match: Add an example for matching on enums
geofft May 13, 2015
d3dd694
Rollup merge of #24987 - bombless:large-array, r=pnkfelix
steveklabnik May 13, 2015
6834d37
Rollup merge of #25224 - brson:stddoc, r=steveklabnik
steveklabnik May 13, 2015
273224b
Rollup merge of #25317 - steveklabnik:trpl_drop, r=alexcrichton
steveklabnik May 13, 2015
8f16862
Rollup merge of #25321 - steveklabnik:second_tutorial, r=alexcrichton
steveklabnik May 13, 2015
b833737
Rollup merge of #25324 - richo:richo-compat, r=huonw
steveklabnik May 13, 2015
cd1f94a
Rollup merge of #25328 - nham:E0106_E0107, r=alexcrichton
steveklabnik May 13, 2015
2b1a1ef
Rollup merge of #25333 - GSam:master, r=nrc
steveklabnik May 13, 2015
b53392c
Merge branch 'doc_release_channels' into rollup
steveklabnik May 13, 2015
80381c3
Merge branch 'doc-fixes' of https://github.com/wheals/rust into rollup
steveklabnik May 13, 2015
2c01eac
Merge branch 'trpl_embedding' into rollup
steveklabnik May 13, 2015
758d568
Merge branch 'trpl-fix-enums' of https://github.com/geofft/rust into …
steveklabnik May 13, 2015
1d34f92
Update error messages for tests in compile-fail for E0066 and E0069.
May 13, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
book: typo fixes, wording improvements.
The text in iterators.md wasn't wrong, but it read awkwardly to my ear.
  • Loading branch information
wheals committed May 12, 2015
commit a22b3270b8dd0c2d23cb420b07ad1feb9691db2d
3 changes: 2 additions & 1 deletion src/doc/trpl/enums.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ Character::Digit(10);
Hand::Digit;
```

Both variants are named `Digit`, but since they’re scoped to the `enum` name,
Both variants are named `Digit`, but since they’re scoped to the `enum` name
there's no ambiguity.

Not supporting these operations may seem rather limiting, but it’s a limitation
which we can overcome. There are two ways: by implementing equality ourselves,
Expand Down
2 changes: 1 addition & 1 deletion src/doc/trpl/error-handling.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ Because these kinds of situations are relatively rare, use panics sparingly.

In certain circumstances, even though a function may fail, we may want to treat
it as a panic instead. For example, `io::stdin().read_line(&mut buffer)` returns
an `Result<usize>`, when there is an error reading the line. This allows us to
a `Result<usize>`, when there is an error reading the line. This allows us to
handle and possibly recover from error.

If we don't want to handle this error, and would rather just abort the program,
Expand Down
6 changes: 3 additions & 3 deletions src/doc/trpl/iterators.md
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ see why consumers matter.
As we've said before, an iterator is something that we can call the
`.next()` method on repeatedly, and it gives us a sequence of things.
Because you need to call the method, this means that iterators
are *lazy* and don't need to generate all of the values upfront.
This code, for example, does not actually generate the numbers
`1-100`, and just creates a value that represents the sequence:
can be *lazy* and not generate all of the values upfront. This code,
for example, does not actually generate the numbers `1-100`, instead
creating a value that merely represents the sequence:

```rust
let nums = 1..100;
Expand Down
2 changes: 1 addition & 1 deletion src/doc/trpl/lifetimes.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ With that in mind, let’s learn about lifetimes.
# Lifetimes

Lending out a reference to a resource that someone else owns can be
complicated, however. For example, imagine this set of operations:
complicated. For example, imagine this set of operations:

- I acquire a handle to some kind of resource.
- I lend you a reference to the resource.
Expand Down
2 changes: 1 addition & 1 deletion src/doc/trpl/ownership.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ println!("v[0] is: {}", v[0]);

Same error: “use of moved value.” When we transfer ownership to something else,
we say that we’ve ‘moved’ the thing we refer to. You don’t need some sort of
special annotation here, it’s the default thing that Rust does.
special annotation here; it’s the default thing that Rust does.

## The details

Expand Down
2 changes: 1 addition & 1 deletion src/doc/trpl/primitive-types.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Let’s go over them by category:
Integer types come in two varieties: signed and unsigned. To understand the
difference, let’s consider a number with four bits of size. A signed, four-bit
number would let you store numbers from `-8` to `+7`. Signed numbers use
“two’s compliment representation”. An unsigned four bit number, since it does
“two’s complement representation”. An unsigned four bit number, since it does
not need to store negatives, can store values from `0` to `+15`.

Unsigned types use a `u` for their category, and signed types use `i`. The `i`
Expand Down