Skip to content

Rollup of 11 pull requests - #73235

Merged
bors merged 33 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-zp8oxhg
Jun 11, 2020
Merged

Rollup of 11 pull requests#73235
bors merged 33 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-zp8oxhg

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

lcnrand others added 30 commits May 20, 2020 14:57
In particular matching on complex types such as strings will cause
deep recursion to happen.
Fixesrust-lang#72933
Fixes more of:
clippy::unused_unit
clippy::op_ref
clippy::useless_format
clippy::needless_return
clippy::useless_conversion
clippy::bind_instead_of_map
clippy::into_iter_on_ref
clippy::redundant_clone
clippy::nonminimal_bool
clippy::redundant_closure
clippy::option_as_ref_deref
clippy::len_zero
clippy::iter_cloned_collect
clippy::filter_next
`saturating_add` example was not parameterized, but passed because the `u8` would saturate successfully
Co-authored-by: lzutao <taolzu@gmail.com>
Fix `is_const_context`, update `check_for_cast`
A better version of rust-lang#71477
Adds `fn enclosing_body_owner` and uses it in `is_const_context`.
`is_const_context` now uses the same mechanism as `mir_const_qualif` as it was previously incorrect.
Renames `is_const_context` to `is_inside_const_context`.
I also updated `check_for_cast` in the second commit, so r? @estebank
(I removed one lvl of indentation, so it might be easier to review by hiding whitespace changes)
…i-obk
Ensure stack when building MIR for matches
In particular matching on complex types such as strings will cause
deep recursion to happen.
Fixesrust-lang#72933
r? @matthewjasper@oli-obk
…_doc-ref-fix, r=ollie27
doc/rustdoc: Fix incorrect external_doc feature flag
…ixes, r=Xanewok
save_analysis: better handle paths and functions signature
This should improve slightly some possible regressions due to hir rework.
r? @Xanewok
Fix more clippy warnings
Fixes more of:
clippy::unused_unit
clippy::op_ref
clippy::useless_format
clippy::needless_return
clippy::useless_conversion
clippy::bind_instead_of_map
clippy::into_iter_on_ref
clippy::redundant_clone
clippy::nonminimal_bool
clippy::redundant_closure
clippy::option_as_ref_deref
clippy::len_zero
clippy::iter_cloned_collect
clippy::filter_next
r? @Dylan-DPC
Automatically prioritize unsoundness issues
r? @spastorino cc @Mark-Simulacrum @rust-lang/wg-prioritization
…laumeGomez
Support proc macros in intra doc link resolution
The feature was written pre-proc macro resolution, so it only supported the wacky MBE resolution rules. This adds support for proc macros as well.
cc @GuillaumeGomezFixesrust-lang#73173
Fix doctest template
`saturating_add` example was not parameterized, but passed because the `u8` would saturate successfully
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ p=11 rollup=never

@bors

bors commented Jun 11, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit ba0a8d2 has been approved by Dylan-DPC

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 11, 2020
@bors

bors commented Jun 11, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ba0a8d2 with merge 50c0192...

@bors

bors commented Jun 11, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 50c0192 to master...

@rustbot

Copy link
Copy Markdown
Collaborator

Error: Invalid triagebot.toml at position 61:1:

TOML parse error at line 61, column 1
|
61 | prioritize_on = [
| ^^^^^^^^^^^^^
unknown field `prioritize_on`, expected `label`

Please file an issue on GitHub at triagebot if there's a problem with this bot, or reach out on #t-infra on Zulip.

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.S-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.

15 participants

@Dylan-DPC-zz@bors@rustbot@cuviper@lcnr@nagisa@GuillaumeGomez@marmeladema@matthiaskrgr@LeSeulArtichaut@Manishearth@qm3ster@RalfJung@Amanieu@Dylan-DPC