Skip to content

Rollup of 8 pull requests - #65845

Merged
bors merged 18 commits into
rust-lang:masterfrom
Centril:rollup-28jtjfc
Oct 26, 2019
Merged

Rollup of 8 pull requests#65845
bors merged 18 commits into
rust-lang:masterfrom
Centril:rollup-28jtjfc

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

eddyband others added 18 commits October 24, 2019 01:58
Make the spacing between the code snippet and verbose structured
suggestions consistent with note and help messages.
Apply review suggestions
Remove links in the module docs
Flatten imports
Apply review suggestions
Remove useless comments
Fix nits
…asper
rustc_typeck: don't record direct callees in generator_interior.
For expressions like `f(g().await)` we were recording `f` as needing to be kept in a temporary (and therefore be tracked by the generator type) across the suspend, even if a function/method path.
However, this is never needed, and can cause issues with complex function types (see rust-lang#65244).
cc @Zoxc@nikomatsakis
libsyntax: Enhance documentation of the AST module
This PR enhances documentation state to the `libsyntax/ast.rs` (as initiative caused by [rustc-guide#474](rust-lang/rustc-dev-guide#474)), by adding:
- Module documentation.
- Doc-comments (and a bit of usual comments) in non-obvious (as for me) places.
- Minor style fixes to improve module readability.
Increase spacing for suggestions in diagnostics
Make the spacing between the code snippet and verbose structured
suggestions consistent with note and help messages.
r? @Centril
…rk-Simulacrum
Adding doc on keyword continue
Partial solution of issue rust-lang#34601.
rustc: make DefPathData (and friends) Copy (now that it uses Symbol).
Spotted this while working on something else.
…etrochenkov
Derive Eq and Hash for SourceInfo again
In https://github.com/bjorn3/rustc_codegen_cranelift/blob/75c24b9c9677600422ec86fa9f4c78fe3678d2ce/src/common.rs#L368 I store it in a `indexmap::IndexSet`, which requires `Eq` and `Hash`. Unfortunately they were removed in rust-lang#65647, so I can't update to latest nightly.
…ion, r=Dylan-DPC
Add more information on rustdoc search
Fixesrust-lang#65735.
r? @kinnison
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=8 rollup=never

@bors

bors commented Oct 26, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit d319ba2 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 26, 2019
@CentrilCentril added the rollup A PR which is a rollup label Oct 26, 2019
@bors

bors commented Oct 26, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d319ba2 with merge 46e6c53...

bors added a commit that referenced this pull request Oct 26, 2019
Rollup of 8 pull requests
Successful merges:
- #65743 (rustc_typeck: don't record direct callees in generator_interior.)
- #65761 (libsyntax: Enhance documentation of the AST module)
- #65772 (Remove the last remaining READMEs)
- #65773 (Increase spacing for suggestions in diagnostics)
- #65791 (Adding doc on keyword continue)
- #65824 (rustc: make DefPathData (and friends) Copy (now that it uses Symbol).)
- #65828 (Derive Eq and Hash for SourceInfo again)
- #65842 (Add more information on rustdoc search)
Failed merges:
- #65825 (rustc: use IndexVec<DefIndex, T> instead of Vec<T>.)
r? @ghost
@bors

bors commented Oct 26, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 46e6c53 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Oct 26, 2019
@bors
bors merged commit d319ba2 into rust-lang:masterOct 26, 2019
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #65845!

Tested on commit 46e6c53.
Direct link to PR: #65845

💔 clippy-driver on windows: test-pass → test-fail (cc @mcarton@oli-obk@Manishearth@flip1995@yaahc@phansch@llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → test-fail (cc @mcarton@oli-obk@Manishearth@flip1995@yaahc@phansch@llogiq, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Oct 26, 2019
Tested on commit rust-lang/rust@46e6c53.
Direct link to PR: <rust-lang/rust#65845>
💔 clippy-driver on windows: test-pass → test-fail (cc @mcarton@oli-obk@Manishearth@flip1995@yaahc@phansch@llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → test-fail (cc @mcarton@oli-obk@Manishearth@flip1995@yaahc@phansch@llogiq, @rust-lang/infra).
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@Centril@bors@rust-highfive@eddyb@mark-i-m@estebank@dorfsmay@bjorn3@popzxc@GuillaumeGomez