Rollup of 11 pull requests #54859
Merged
Rollup of 11 pull requests #54859
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
Provides an overview on why synchronization is required, as well a short summary of what sync primitives are available.
Because `fn main()` was added automatically, the variables were actually local statics.
Reword the lead paragraph and turn the list items into complete sentences.
This property was introduced by 3f92ff3, but looks it doesn't overwrap even without the property. Fixes rust-lang#54672.
This reverts commit 21d2a6c.
This reverts commit 1908892.
This reverts commit 1a1a7f6.
This reverts commit 11e488b.
This reverts commit 6ce76ac.
Removes unnecessary type mismatch error from test that was hiding borrow check error from NLL stderr.
…teveklabnik Expand the documentation for the `std::sync` module I've tried to expand the documentation for Rust's synchronization primitives. The module level documentation explains why synchronization is required when working with a multiprocessor system, and then links to the appropiate structure in this module. Fixes rust-lang#29377, since this should be the last item on the checklist (documentation for `Atomic*` was fixed in rust-lang#44854, but not ticked off the checklist).
Cleanup rustc/ty part 1 Part 2 will follow soon; I wouldn't want these changes to rot too quickly. - improve stack shifting and remove related allocations - move a faster early return up - improve allocations - use Cow<str> where applicable - simplify common patterns - whitespace fixes
Add examples to `TyKind::FnDef` and `TyKind::FnPtr` docs This adds two examples to the docs of `TyKind::FnDef` and `TyKind::FnPtr`. I found these two types a bit confusing when I learned about them and I think adding these examples might help others.
…nikomatsakis Only warn about unused `mut` in user-written code Fixes rust-lang#54586. r? @pnkfelix cc @blitzerr
add suggestion for inverted function parameters Fixes rust-lang#54065.
…pe-with-lifetime, r=nikomatsakis Regression test for rust-lang#32382.
make `Parser::parse_foreign_item()` return a foreign item or error Fixes `Parser::parse_foreign_item()` to follow the convention of `parse_trait_item()` and `parse_impl_item()` in that it *must* parse an item or return an error, and then the caller is responsible for detecting the closing delimiter. This prevents it from looping endlessly on an unexpected token in `ext/expand.rs` where it was also leaking memory by continually pushing to `Parser::expected_tokens` via `Parser::check_keyword()`. closes rust-lang#54441 r? @petrochenkov cc @dtolnay
…omez rustdoc: overflow:auto doesn't work nicely on small screens This property was introduced by 3f92ff3, but looks it doesn't overwrap even without the property. Fixes rust-lang#54672.
Fix typo in src/libsyntax/parse/parser.rs contast -> contrast
…ckler Fix a regression in 1.30 by reverting rust-lang#53564 Investigation on rust-lang#54477 revealed rust-lang#53564 as the culprit in the regression for that crate. I've reproduced the regression with the [detailed test cases provided](rust-lang#54477 (comment)). While we figure out how to fix the regression this commit reverts the current culprit.
…ime-suggestion-test, r=nikomatsakis Remove unneccessary error from test, revealing NLL error. Part of rust-lang#52663. Removes unnecessary type mismatch error from test that was hiding borrow check error from NLL stderr. r? @nikomatsakis
|
@bors r+ p=11 |
|
📌 Commit 51334c9 has been approved by |
bors
added
the
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Oct 6, 2018
Rollup of 11 pull requests Successful merges: - #54078 (Expand the documentation for the `std::sync` module) - #54717 (Cleanup rustc/ty part 1) - #54781 (Add examples to `TyKind::FnDef` and `TyKind::FnPtr` docs) - #54787 (Only warn about unused `mut` in user-written code) - #54804 (add suggestion for inverted function parameters) - #54812 (Regression test for #32382.) - #54833 (make `Parser::parse_foreign_item()` return a foreign item or error) - #54834 (rustdoc: overflow:auto doesn't work nicely on small screens) - #54838 (Fix typo in src/libsyntax/parse/parser.rs) - #54851 (Fix a regression in 1.30 by reverting #53564) - #54853 (Remove unneccessary error from test, revealing NLL error.) Failed merges: r? @ghost
|
☀️ Test successful - status-appveyor, status-travis |
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.
Successful merges:
std::syncmodule #54078 (Expand the documentation for thestd::syncmodule)TyKind::FnDefandTyKind::FnPtrdocs #54781 (Add examples toTyKind::FnDefandTyKind::FnPtrdocs)mutin user-written code #54787 (Only warn about unusedmutin user-written code)Parser::parse_foreign_item()return a foreign item or error #54833 (makeParser::parse_foreign_item()return a foreign item or error)Failed merges:
r? @ghost