Rollup of 8 pull requests #33551
Closed
Rollup of 8 pull requests #33551
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 10, 2016
steveklabnik
commented
- Successful merges: add help on pattern guard #33260, typeck: if a private field exists, also check for a public method #33342, middle: reset loop labels while visiting closure #33345, Add detailed error explanation for E0504 #33386, doc: Fix tiny typo in vec-alloc.md #33524, E0061 typo fix #33528, fix DFS for region error reporting #33539, Improve "since" tag placement #33542
- Failed merges:
This should fix rust-lang#31754 and follow-up rust-lang#25343. Before the latter, the closure was visited twice in the context of the enclosing fn, which made even a single closure with a loop label emit a warning. With this change, the closure is still visited within the context of the main fn (which is intended, since it is not a separate item) but resets the found loop labels while being visited. Fixes: rust-lang#31754
fix too long column fix typo of help on pattern guard one nit fix compile fail
Removed unnecessary use of threads from E0504 Cleaned up line ending on E0504 Added more examples for E0504 Changed to erroneous code wording Switched Rc example to thread/Arc example Added comments describing why errors no longer occur
Change `fast an loose` to `fast and loose`.
For example, `Vec::len` is both a field and a method, and usually encountering `vec.len` just means that the parens were forgotten. Fixes: rust-lang#26472
This was causing terrible error reports, because the algorithm was incorrectly identifying the constraints.
…illaumegomez add help on pattern guard
typeck: if a private field exists, also check for a public method For example, `Vec::len` is both a field and a method, and usually encountering `vec.len` just means that the parens were forgotten. Fixes: rust-lang#26472 NOTE: I added the parameter `allow_private` to `method::exists` since I don't want to suggest inaccessible methods. For the second case, where only the method exists, I think it would make sense to set it to `false` as well, but I wanted to preserve compatibility for this case.
middle: reset loop labels while visiting closure This should fix rust-lang#31754 and follow-up rust-lang#25343. Before the latter, the closure was visited twice in the context of the enclosing fn, which made even a single closure with a loop label emit a warning. With this change, the closure is still visited within the context of the main fn (which is intended, since it is not a separate item) but resets the found loop labels while being visited. Fixes: rust-lang#31754 Note: I amended the test file from rust-lang#25343, but I don't know if the original or amended test are effective, since as far as I could see, compiletest's run-pass tests do not check for zero warnings emitted? /cc @Manishearth
Add detailed error explanation for E0504 Part of rust-lang#32777
…d-loose, r=steveklabnik doc: Fix tiny typo in vec-alloc.md Change `fast an loose` to `fast and loose`.
E0061 typo fix Fixed silly typo.
fix DFS for region error reporting This was causing terrible error reports, because the algorithm was incorrectly identifying the constraints. r? @eddyb
…labnik Improve "since" tag placement Continuation of rust-lang#33431. r? @steveklabnik
|
r? @jroesch (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=1 |
|
📌 Commit b77f2c9 has been approved by |
|
⌛ Testing commit b77f2c9 with merge f968504... |
|
💔 Test failed - auto-mac-64-opt |
|
☔ The latest upstream changes (presumably #33425) made this pull request unmergeable. Please resolve the merge conflicts. |
|
just timed out, but now has merge conflicts, so making a new one |
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.