Rollup of 10 pull requests #25887
Closed
Rollup of 10 pull requests #25887
Conversation
This file contains 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 29, 2015
steveklabnik
commented
- Successful merges: Document #[repr] on non-C-like enums #25651, Add a missing space to the Glossary page of TRPL #25788, Improve mem::forget documentation #25861, removed lonely closing parenthesis #25864, Corrected typo #25865, Update style guide with latest commits from rust-guidelines #25866, Add 5 more error explanations. Update E0015's explanation. Add an error code. #25873, remove the last mentions of IoResult #25876, Add syntax for multiple lifetimes #25883, trpl: eight sections, not seven #25886
- Failed merges:
rustc accepts the following today:
#[repr(u8)]
enum Flag<T> {
Dropped,
Alive(T),
}
and it has a good use (it appears to me): this inhibits the non-nullable
pointer optimization that the regular Option<T> and similar enums allow.
Document this in the reference, and add tests to make sure it compiles.
This means that we guarantee with `repr` that the discriminant will be
present and with that size, but not sure if we want to guarantee
anything more (no guarantee on placement in struct).
There was no opening parenthesis for this closing parenthesis...
"workd" corrected to "world"
The current version of hoedown treats lists interrupting paragraphs in the Markdown.pl style rather than CommonMark, so a newline is needed for the list to be rendered properly.
"Idiomatic code should not use extra whitespace in the middle of a line to provide alignment."
Also changes 'owned pointers' => 'boxes' in the error message.
This adds an example from mem::swap, and provides some suggested uses of this function. Change wording on comment on forget line to be more specific as to why we need to call forget. This breaks the examples up into three pieces. The last piece isn't compiling for some reason.
Document #[repr] on non-C-like enums
rustc accepts the following today:
#[repr(u8)]
enum Flag<T> {
Dropped,
Alive(T),
}
and it has a good use (it appears to me): this inhibits the non-nullable
pointer optimization that the regular Option<T> and similar enums allow.
Document this in the reference, and add tests to make sure it compiles.
This means that we guarantee with `repr` that the discriminant will be
present and with that size, but not sure if we want to guarantee
anything more (no guarantee on placement in struct).
…ossary, r=steveklabnik r? @steveklabnik
This adds an example from mem::swap, and provides some suggested uses of this function. This is my attempt to summarize the answers to a question I asked on reddit http://www.reddit.com/r/rust/comments/37jcul/what_is_forget_for/ and add the answers to the documentation so that no one else has to google or ask the question again.
There was no opening parenthesis for this closing parenthesis...
"workd" corrected to "world"
…abnik So that rust-guidelines can be deleted and src/doc/style can prosper as the official home of the rust guidelines. 😃
The E0397 explanation, as I've written it, isn't really an explanation, but I'm not sure what to put here. I will happily take suggestions. Partially addresses rust-lang#25851
|
r? @pcwalton (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=100 |
|
📌 Commit 72a8c4c has been approved by |
|
⌛ Testing commit 72a8c4c with merge 8ed0e36... |
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.