Rollup of 8 pull requests #48261
Closed
Rollup of 8 pull requests #48261
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
GuillaumeGomez
commented
Feb 16, 2018
GuillaumeGomez
commented
- Successful merges: Fix span of visibility #47799, add unit tests for rustdoc's processing of doctests #48095, detect wrong number of args when type-checking a closure #48123, Primitive docs relevant #48152, Remove "empty buffer" doc in read_until #48234, move Cargo.toml to live alongside x.py #48236, Fix condvar example #48239, spelling fix in comment #48243
- Failed merges:
Instead of creating inference variables for those argument types, use the trait error-reporting code to give a nicer error.
This span covers the whole visibility expression: e.g. `pub (in path)`.
This appears copied from fill_buf, but the above paragraph already indicates that a lack of delimiter at the end is EOF.
… r=petrochenkov Fix span of visibility This PR 1. adds a closing parenthesis to the span of `Visibility::Crate` (e.g. `pub(crate)`). The current span only covers `pub(crate`. 2. adds a `span` field to `Visibility::Restricted`. This span covers the entire visibility expression (e.g. `pub (in self)`). Currently all we can have is a span for `Path`. This PR is motivated by the bug found in rustfmt (rust-lang/rustfmt#2398). The first change is a strict improvement IMHO. The second change may not be desirable, as it adds a field which is currently not used by the compiler.
…=GuillaumeGomez add unit tests for rustdoc's processing of doctests cc rust-lang#42018 There's a lot of things that rustdoc will do to massage doctests into something that can be compiled, and a lot of options that can be toggled to affect this. Hopefully this list of tests can show off that functionality. The first commit is slightly unrelated but doesn't touch public functionality, because i found that if you have a manual `fn main`, it adds an extra line break at the end, whereas it would trim this extra line break if it were putting a `fn main` in automatically. That first commit makes it trim out that whitespace ahead of time.
…um-args, r=estebank detect wrong number of args when type-checking a closure Instead of creating inference variables for those argument types, use the trait error-reporting code to give a nicer error. This also improves some other spans for existing tests. Fixes rust-lang#47244 r? @estebank
…uietMisdreavus Primitive docs relevant This fixes the documentation to show the right types in the examples for many integer methods. I need to check if the result is correct before we merge.
Remove "empty buffer" doc in read_until This appears copied from fill_buf, but the above paragraph already indicates that a lack of delimiter at the end is EOF.
…o-toml, r=alexcrichton move Cargo.toml to live alongside x.py This makes it so that, when you `./x.py`, you get errors relative to the location of `x.py`. I would also be fine with moving `x.py` into `src`, if that is deemed preferable. (Is this a good idea?) One of the other seems to make sense to me, but I'm curious what others think. =) r? @alexcrichton cc @pnkfelix (I suppose one could also run `../x.py` from the `src` directory, but then that creates `src/build` directory, which I don't particularly like.) (Also, this is only minimally tested.)
… r=QuietMisdreavus Fix condvar example Fixes rust-lang#48230. r? @QuietMisdreavus
…ennytm spelling fix in comment r? @Manishearth
|
r? @BurntSushi (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=8 |
|
📌 Commit 2844406 has been approved by |
bors
added
the
S-waiting-on-bors
|
@GuillaumeGomez as much as I'd like to see a fix for issue #47355 land, I am not sure that PR #48236 is as fully-prepared-for-landing compared to PR #47731 , and therefore we may not want to include it in the rollup... (Of course, we can also just see if bors rejects this rollup due to its inclusion of PR #48236...) |
|
⌛ Testing commit 2844406 with merge 79b07d45cc198a2e757b01638a4ea1e0276bc347... |
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
|
Failed on i686, legit... caused by #48152. |
|
Then let's close it. |
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.