Rollup of 5 pull requests #25129
Merged
Rollup of 5 pull requests #25129
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 5, 2015
steveklabnik
commented
- Successful merges: TRPL: ownership, borrowing, and lifetimes #24782, TRPL: guessing game #25080, Fix indentation in while-let example #25112, Ensure diagnostic error descriptions are markdown formatted. #25114, Indicate code is code-like in diagnostic error message #25127
- Failed merges:
Fix rust-lang#24805 (see follow-on commit for test.)
Namely, we need to catch cases like `trait Child : Parent { }` where
`Parent` itself defines methods.
The new functionality being tested here is that a drop impl bounded by `UserDefined` does not cause dropck to inject its conservative constraints on region inference.
This + DST coercions (rust-lang#24619) would allow code like `Rc<RefCell<Box<Trait>>>` to be simplified to `Rc<RefCell<Trait>>`.
Stack overflow detection does not currently work with MUSL, so this test needs to be disabled.
- I found n error in the book, before contributing the patch to fix it, I had to find where they were hosted - It took me quite look to find where within the rust-lang *organisation* it was!
Without the inline annotation this:
str::from_utf8_unchecked( slice::from_raw_parts( ptr, len ) )
doesn't get inlined which can be pretty brutal performance-wise
when used in an inner loop of a low level string manipulation method.
- `FIle::open` is for opening a file in read-only mode - `FIle::create` is for opening a file in write-only mode, which is what we want instead for this example to make sense
Since the hashmap and its hasher are implemented in different crates, we currently can't benefit from inlining, which means that especially for small, fixed size keys, there is a huge overhead in hash calculations, because the compiler can't apply optimizations that only apply for these keys. Fixes the brainfuck benchmark in rust-lang#24014.
This way, the module index renders only the first sentence as a short description.
This + DST coercions (rust-lang#24619) would allow code like `Rc<RefCell<Box<Trait>>>` to be simplified to `Rc<RefCell<Trait>>`.
Since the hashmap and its hasher are implemented in different crates, we currently can't benefit from inlining, which means that especially for small, fixed size keys, there is a huge overhead in hash calculations, because the compiler can't apply optimizations that only apply for these keys. Fixes the brainfuck benchmark in rust-lang#24014.
…eklabnik I corrected several spelling errors in the external documentation.
This did not render as intended: >This is defined in RFC 5737 - 192.0.2.0/24 (TEST-NET-1) - 198.51.100.0/24 (TEST-NET-2) - 203.0.113.0/24 (TEST-NET-3) vs. > This is defined in RFC 5737 - 192.0.2.0/24 (TEST-NET-1) - 198.51.100.0/24 (TEST-NET-2) - 203.0.113.0/24 (TEST-NET-3)
`str`s is messy but string is incorrect.
…, r=steveklabnik Right now it's all hosted over GitHub pages so https doesn't work, so only link to the http version.
Generalize dropck to ignore item-less traits Fix rust-lang#24805. (This is the reopened + rebased version of PR rust-lang#24898)
…r=nikomatsakis This test has deadlocked on Windows once or twice now and we've had lots of problems in the past of threads panicking when the process is being shut down. One of the two threads in this test is guaranteed to panic because of the `.unwrap()` on the `send` calls, so just call `recv` on both receivers after the test executes to ensure that both threads are dying/dead.
Also, as @huonw guessed, move semantics really _does_ make more sense as a sub-chapter of ownership.
…atsakis Also, as @huonw guessed, move semantics really _does_ make more sense as a sub-chapter of ownership.
…richton This also made me realize that I wasn't using the correct term, 'associated functions', rather than 'static methods'. So I corrected that in the method syntax chapter.
The indentation in this example is messed up. The `_ => break,` line was using a tab instead of spaces to indent.
…xcrichton I've added backticks in a few places to ensure correct highlighting in the HTML output (cf rust-lang#25062). Other changes include: * Remove use of `1.` and `2.` separated by a code block as this was being rendered as two separate lists beginning at 1. * Correct the spelling of successful in two places (from "succesful"). Other changes are a result of reflowing text to stay within the 80 character limit.
|
r? @pcwalton (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=1000 |
|
📌 Commit d507c38 has been approved by |
|
⌛ Testing commit d507c38 with merge 252b544... |
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.