[beta] backport #114748
Merged
[beta] backport #114748
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
(cherry picked from commit 3dbbf23)
(cherry picked from commit fa15df6)
(cherry picked from commit f25ad54)
`()` is normally FFI-unsafe, but is FFI-safe when used as a return type. It is also desirable that a transparent newtype for `()` is FFI-safe when used as a return type. In order to support this, when an type was deemed FFI-unsafe, because of a `()` type, and was used in return type - then the type was considered FFI-safe. However, this was the wrong approach - it didn't check that the `()` was part of a transparent newtype! The consequence of this is that the presence of a `()` type in a more complex return type would make it the entire type be considered safe (as long as the `()` type was the first that the lint found) - which is obviously incorrect. Instead, this logic is removed, and a unit return type or a transparent wrapper around a unit is checked for directly for functions and fn-ptrs. Signed-off-by: David Wood <[email protected]> (cherry picked from commit f53cef3)
Simplify this function a bit, it was quite hard to reason about. Signed-off-by: David Wood <[email protected]> (cherry picked from commit 99b1897)
Consider `()` within types to be FFI-safe, and `()` to be FFI-safe as a return type (incl. when in a transparent newtype). Signed-off-by: David Wood <[email protected]> (cherry picked from commit 24f90fd)
(cherry picked from commit 45ffe41)
(cherry picked from commit fb31a1a)
Now that this lint runs on any external-ABI fn-ptr, normalization won't always succeed, so use `try_normalize_erasing_regions` instead. Signed-off-by: David Wood <[email protected]> (cherry picked from commit 09434a2)
Rust requires a previous version of Rust to build, such as the current version, or the previous version. However, the version comparison logic did not take patch releases into consideration when doing the version comparison for the current branch, e.g. Rust 1.71.1 could not be built by Rust 1.71.0 because it is neither an exact version match, or the previous version. Adjust the version comparison logic to tolerate mismatches in the patch version. Signed-off-by: Ariadne Conill <[email protected]> (cherry picked from commit 31a81a0)
…ported_symbols to only export the two symbols that proc-macros need. (cherry picked from commit 3000c24)
(cherry picked from commit 7a0e2ee)
fix to test as proposed by wesleywiser Co-authored-by: Wesley Wiser <[email protected]> (cherry picked from commit 5881e5f)
…conditional logic otherwise. (cherry picked from commit a2058dd)
…uct for the host. thus we should no longer see test failures for e.g. wasm32 target. (cherry picked from commit a2a7f27)
|
rustbot
added
S-waiting-on-review
(cherry picked from commit fb5efd7)
|
@bors r+ rollup=never p=1 |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
This was referenced Aug 14, 2023
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.
()return type checks #113457cast_ref_to_mutlint #113422r? cuviper