Rollup of 5 pull requests #25357
Merged
Rollup of 5 pull requests #25357
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
steveklabnik
commented
May 13, 2015
steveklabnik
commented
- Successful merges: std: Update crate docs #25224, TRPL: Drop #25317, TRPL: dining philosophers #25321, readme: Rework the arch support matrix #25324, TRPL: Fix the enums chapter #25348
- Failed merges: TRPL: release channels #25174, book: typo fixes, wording improvements. #25334, TRPL: embedding rust #25341
Attempted to organize them in a way more relevant to what newbies would be interested in hearing.
Corrected "Ownership": - [`Variable bindings`] link was not processed properly. - Changed the paragraph about move semantics with two vectors, because it was confusing. - Removed "So it may not be as inefficient as it initially seems", because there is nothing that seems inefficient in copying pointers only. - Other text corrections. Fixed copied-and-pasted text mistakes. Revised the paragraph about moving a vector (taking into account suggestions by echochamber). Fixed markdown. Fixes requested by steveklabnik. Brought back a sentence about supposed inefficiency.
`if` can be a statement or also an expression.
I also capitalised "The Standard Library" and neatened a few bits of grammar. Also fixed: `#[main]` inside one of the error descriptions.
These two traits are commonly confused. As such, explain the difference. Fixes rust-lang#24163
The text in iterators.md wasn't wrong, but it read awkwardly to my ear.
Revert an accidental revert.
These two traits are commonly confused. As such, explain the difference. Fixes rust-lang#24163 r? @aturon
…bnik I corrected some pretty obvious textual mistakes. One thing requires more attention - the paragraph at line 133 in Ownership. It was confusing, so I changed it, but I am no sure if this is what the author had in mind.
Add diagnostic message for E0317, E0154, E0259 and E0260; part of rust-lang#24407. About E0317, I was unsure if I should add an example of what could be wrong, such as `struct i64`, `enum char { A, B }` or `type isize = i64`. I decided against it, since the diagnostic message looks clear enough to me. What do you think?
`if` can be a statement or also an expression.
…anishearth At the moment, http://doc.rust-lang.org/error-index.html isn't linked to from anywhere (except Reddit). This should allow search engines to find error codes! I also capitalised "The Standard Library" and neatened a few bits of grammar. Also fixed: `#[main]` inside one of the error descriptions.
…anual, r=steveklabnik I did a read through of the manual. This commit corrects various small points and expands some sections, while avoiding too much detail. r? @steveklabnik
- Successful merges: rust-lang#24996, rust-lang#25220, rust-lang#25221, rust-lang#25267, rust-lang#25322, rust-lang#25327, rust-lang#25329, rust-lang#25330, rust-lang#25331, rust-lang#25335 - Failed merges: rust-lang#25334
Attempted to organize them in a way more relevant to what newbies would be interested in hearing. I am not satisfied by this at all, but by virtue of deleting old links alone I think it is an improvement. r? @steveklabnik
…xcrichton This is a little rough, and it needs squashed and section headers, but i'd like to get some eyes on it sooner rather than later.
This makes the compatibility matrix render a little nicer on github, and also removes a note about windows support from 0.12 (Which is immaterial now that we're approaching 1.0)
The enums chapter at the moment is ... weird. The examples aren't about enums, they're about structs, and most of the chapter talks about how enums don't support comparison operators by default (which is also true of other compound data types.) I think there was a story here once, but some coherency got lost in refactoring. There are two preliminary patches here, one to combine the struct and tuple-struct chapters, and one to document unit-like structs, because enum syntax is easier to explain once you have those three. The final patch moves the enum chapter after the struct chapter, and rewrites most of it to talk about enums usefully (including covering matches on enums). r? @steveklabnik
|
r? @pcwalton (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=100000 |
|
📌 Commit 11f945c has been approved by |
|
@bors: force |
bors
added a commit
that referenced
this pull request
May 13, 2015
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.