Rollup of 6 pull requests #30126
Merged
Rollup of 6 pull requests #30126
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
Contributor
steveklabnik
commented
Nov 30, 2015
steveklabnik
commented
- Successful merges: Change verbiage in Stack & Heap page #30108, Additional text and examples about casting #30114, Fix pointer value in the 'complex example' on stack/heap #30115, Write some docs for ToString #30119, Document std::string::ParseError #30120, Fix path to TRPL in doc README #30122
- Failed merges:
Made a small change in the sentence. It seemed confusing to read the word "actual" twice in the sentence; I removed it completely.
…hange Change verbiage in Stack & Heap page
The `f` argument will reference the actual value in the `d` box, not the box in the `bar`'s stack frame.
Thanks @Manishearth
Sorry, thanks to @Ms2ger for pointing this out in rust-lang#30088 (comment)
…teveklabnik
The `f` argument will reference the actual value in the `d` box, not the box in the `bar`'s stack frame.
I am just learning Rust, so I don't know how to explain this well, but just from `f`'s type it is clear that it will be a pointer to an `i32`, not a pointer to a pointer. Some `println!("{:p}", ...)`'s can easily confirm this.
I would actually suggest to remove/simplify this part of the example. This is a subtle issue that can easily confuse people at the early stages of familiarizing with the language. (As I got confused by it. :))
…, r=alexcrichton Part of rust-lang#29376
…hearth Along with rust-lang#30121, this should fix the last fallout from rust-lang#29932
|
@bors: r+ p=1 |
|
📌 Commit 06df5d8 has been approved by |
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.