Skip to content

Rollup of 9 pull requests - #87808

Merged
bors merged 23 commits into
rust-lang:masterfrom
JohnTitor:rollup-qqp79xs
Aug 6, 2021
Merged

Rollup of 9 pull requests#87808
bors merged 23 commits into
rust-lang:masterfrom
JohnTitor:rollup-qqp79xs

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

devnexenand others added 23 commits July 28, 2021 18:22
Test that FFI-safety warnings don't get accidentally dropped on naked
functions. The big picture is that if you implement a naked function
with the Rust ABI you'll get a warning. Further, if you implement a
naked function with a standardized ABI, but use non-FFI-safe types you
will still get a warning.
rust-lang/rfcs#2774rust-lang/rfcs#2972
This was removed by rust-lang#85284 in favor of -Zprofiler-runtime=<name>.
However the suggested -Zprofiler-runtime=None doesn't work because
"None" is treated as a crate name.
As per MCP#428[1] this target becomes Tier 2.
[1]: rust-lang/compiler-team#428
The sentence exists to highlight the existence of a
performance footgun of repeated calls of the
reserve_exact function.
…uillaumeGomez
Add long error explanation for E0625
For rust-lang#61137.
explicit_generic_args_with_impl_trait: fix min expected number of generics
Fixesrust-lang#87718
The problem was that `synth_type_param_count` was already subtracted from `named_type_param_count`, so this ended up being subtracted again. This caused `expected_min` to overflow, and ultimately resulting in weird and wrong behaviour.
I've also added another test not present in the original issue but caused by the same bug.
Validate FFI-safety warnings on naked functions
Test that FFI-safety warnings don't get accidentally dropped on naked
functions. The big picture is that if you implement a naked function
with the Rust ABI you'll get a warning. Further, if you implement a
naked function with a standardized ABI, but use non-FFI-safe types you
will still get a warning.
rust-lang/rfcs#2774rust-lang/rfcs#2972
cc ``````@joshtriplett`````` ``````@Amanieu`````` ``````@haraldh``````
…h726
Add back -Zno-profiler-runtime
This was removed by rust-lang#85284 in favor of `-Zprofiler-runtime=<name>`.However the suggested `-Zprofiler-runtime=None` doesn't work because`None` is treated as a crate name.
Re-use std::sealed::Sealed in os/linux/process.
This uses `std::sealed::Sealed` in `std::os::linux::process` instead of defining new `Sealed` traits there.
…rk-Simulacrum
Promote `aarch64-apple-ios-sim` to Tier 2
As per rust-lang/compiler-team#428 this target becomes Tier 2.
---
I tested that the latest nightly has the target and I'm already building my project with that on CI and locally.
permit drop impls with generic constants in where clauses
Fixesrust-lang#79248
`==` is not sufficient to check for equality between unevaluated consts which causes the above issue because the const in `[(); N - 1]:` on the impl and the const in `[(); N - 1]:` on the struct def are not seen as equal. Any predicate that can contain an unevaluated const cant use `==` here as it will cause us to incorrectly emit an error.
I dont know much about chalk but it seems like we ought to be relating the `TypeWellFormedFromEnv` instead of `==` as it contains a `Ty` so I added that too...
r? ``````@lcnr``````
alloc: Use intra doc links for the reserve function
The sentence exists to highlight the existence of a
performance footgun of repeated calls of the
reserve_exact function.
@rustbotrustbot added the rollup A PR which is a rollup label Aug 6, 2021
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=9 rollup=never

@bors

bors commented Aug 6, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit b98c388 has been approved by JohnTitor

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

bors commented Aug 6, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b98c388 with merge 1f94abc...

@bors

bors commented Aug 6, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 1f94abc to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 6, 2021
@bors
bors merged commit 1f94abc into rust-lang:masterAug 6, 2021
@rustbotrustbot added this to the 1.56.0 milestone Aug 6, 2021
@JohnTitor
JohnTitor deleted the rollup-qqp79xs branch August 6, 2021 12:21
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.

12 participants

@JohnTitor@bors@rustbot@devnexen@bhgomes@SkiFire13@npmccallum@Amanieu@m-ou-se@badboy@BoxyUwU@est31