Skip to content

Rollup of 9 pull requests #25336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 25 commits into from
Closed

Conversation

bombless and others added 25 commits April 30, 2015 23:41
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
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
@rust-highfive
Copy link
Contributor

r? @huonw

(rust_highfive has picked a reviewer for you, use r? to override)

@steveklabnik
Copy link
Member Author

@bors: r+ rollup p=1

@bors
Copy link
Collaborator

bors commented May 12, 2015

📌 Commit 34bc44f has been approved by steveklabnik

@steveklabnik
Copy link
Member Author

@bors: rollup-

@bors
Copy link
Collaborator

bors commented May 12, 2015

⌛ Testing commit 34bc44f with merge cc47d2f...

@bors
Copy link
Collaborator

bors commented May 12, 2015

💔 Test failed - auto-linux-32-opt

@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.