Type params and assoc types have unit metadata if they are sized#93977
Merged
bors merged 3 commits intorust-lang:masterfrom Mar 15, 2022
Merged
Type params and assoc types have unit metadata if they are sized#93977bors merged 3 commits intorust-lang:masterfrom
bors merged 3 commits intorust-lang:masterfrom
Conversation
rustbot
added
the
T-compiler
Contributor
|
r? @wesleywiser (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
compiler-errors
force-pushed
the
sized-generic-metadata
branch
from
ad8a907 to
4774961
Compare
This comment has been minimized.
This comment has been minimized.
compiler-errors
force-pushed
the
sized-generic-metadata
branch
from
83c9cb1 to
0ad6212
Compare
3 tasks
Contributor
|
DetailsMap indexing in rust/compiler/rustc_metadata/src/rmeta/decoder.rs Lines 1609 to 1617 in 28c8a34 |
Contributor
Author
|
Are you sure you don't need to Like I don't know if this is related to the PR. |
Contributor
|
Indeed |
Collaborator
|
☔ The latest upstream changes (presumably #93148) made this pull request unmergeable. Please resolve the merge conflicts. |
Contributor
|
@compiler-errors I’ve pushed a rebase at https://github.com/SimonSapin/rust/commits/sized-generic-metadata |
compiler-errors
force-pushed
the
sized-generic-metadata
branch
from
0ad6212 to
877dec5
Compare
This comment has been minimized.
This comment has been minimized.
Contributor
Author
|
whoops! fixed bug after rebase |
compiler-errors
force-pushed
the
sized-generic-metadata
branch
from
877dec5 to
b1d6179
Compare
wesleywiser
reviewed
Mar 1, 2022
compiler-errors
force-pushed
the
sized-generic-metadata
branch
from
b1d6179 to
210e829
Compare
This comment was marked as outdated.
This comment was marked as outdated.
Contributor
Author
|
@wesleywiser, mind taking a look at this again? added that test you asked for |
wesleywiser
approved these changes
Mar 14, 2022
Member
|
Thanks @compiler-errors! @bors r+ |
Collaborator
|
📌 Commit 210e829 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 14, 2022
…askrgr Rollup of 5 pull requests Successful merges: - rust-lang#90621 (Stabilise `aarch64_target_feature`) - rust-lang#93977 (Type params and assoc types have unit metadata if they are sized) - rust-lang#94670 (Improve `expect` impl and handle `#[expect(unfulfilled_lint_expectations)]` (RFC 2383)) - rust-lang#94884 (Fix remaining meta-variable expression TODOs) - rust-lang#94931 (update miri) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
SimonSapin
added a commit
to SimonSapin/rust
that referenced
this pull request
May 13, 2022
Fixes rust-lang#93959 This change was accepted in https://rust-lang.github.io/rfcs/2580-ptr-meta.html Note that this changes the signature of **stable** functions. The change should be backward-compatible, but it is **insta-stable** since it cannot (easily, at all?) be made available only through a `#![feature(…)]` opt-in. The RFC also proposed the same change for `NonNull::dangling`, which makes sense it terms of its signature but not in terms of its implementation. `dangling` uses `align_of()` as an address. But what `align_of()` should be for extern types or whether it should be allowed at all remains an open question. This commit depends on rust-lang#93977, which is not yet part of the bootstrap compiler. So `#[cfg]` is used to only apply the change in stage 1+. As far a I know bounds cannot be made conditional with `#[cfg]`, so the entire functions are duplicated. This is unfortunate but temporary. Since this duplication makes it less obvious in the diff, the new definitions differ in: * More permissive bounds (`Thin` instead of implied `Sized`) * Different implementation * Having `rustc_allow_const_fn_unstable(ptr_metadata)`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 25, 2022
Extend ptr::null and null_mut to all thin (including extern) types Fixes rust-lang#93959 This change was accepted in https://rust-lang.github.io/rfcs/2580-ptr-meta.html Note that this changes the signature of **stable** functions. The change should be backward-compatible, but it is **insta-stable** since it cannot (easily, at all?) be made available only through a `#![feature(…)]` opt-in. The RFC also proposed the same change for `NonNull::dangling`, which makes sense it terms of its signature but not in terms of its implementation. `dangling` uses `align_of()` as an address. But what `align_of()` should be for extern types or whether it should be allowed at all remains an open question. This commit depends on rust-lang#93977, which is not yet part of the bootstrap compiler. So `#[cfg]` is used to only apply the change in stage 1+. As far a I know bounds cannot be made conditional with `#[cfg]`, so the entire functions are duplicated. This is unfortunate but temporary. Since this duplication makes it less obvious in the diff, the new definitions differ in: * More permissive bounds (`Thin` instead of implied `Sized`) * Different implementation * Having `rustc_allow_const_fn_unstable(const_fn_trait_bound)` * Having `rustc_allow_const_fn_unstable(ptr_metadata)`
workingjubilee
pushed a commit
to pgcentralfoundation/postgrestd
that referenced
this pull request
Sep 15, 2022
Fixes rust-lang/rust#93959 This change was accepted in https://rust-lang.github.io/rfcs/2580-ptr-meta.html Note that this changes the signature of **stable** functions. The change should be backward-compatible, but it is **insta-stable** since it cannot (easily, at all?) be made available only through a `#![feature(…)]` opt-in. The RFC also proposed the same change for `NonNull::dangling`, which makes sense it terms of its signature but not in terms of its implementation. `dangling` uses `align_of()` as an address. But what `align_of()` should be for extern types or whether it should be allowed at all remains an open question. This commit depends on rust-lang/rust#93977, which is not yet part of the bootstrap compiler. So `#[cfg]` is used to only apply the change in stage 1+. As far a I know bounds cannot be made conditional with `#[cfg]`, so the entire functions are duplicated. This is unfortunate but temporary. Since this duplication makes it less obvious in the diff, the new definitions differ in: * More permissive bounds (`Thin` instead of implied `Sized`) * Different implementation * Having `rustc_allow_const_fn_unstable(ptr_metadata)`
workingjubilee
pushed a commit
to pgcentralfoundation/postgrestd
that referenced
this pull request
Sep 15, 2022
Extend ptr::null and null_mut to all thin (including extern) types Fixes rust-lang/rust#93959 This change was accepted in https://rust-lang.github.io/rfcs/2580-ptr-meta.html Note that this changes the signature of **stable** functions. The change should be backward-compatible, but it is **insta-stable** since it cannot (easily, at all?) be made available only through a `#![feature(…)]` opt-in. The RFC also proposed the same change for `NonNull::dangling`, which makes sense it terms of its signature but not in terms of its implementation. `dangling` uses `align_of()` as an address. But what `align_of()` should be for extern types or whether it should be allowed at all remains an open question. This commit depends on rust-lang/rust#93977, which is not yet part of the bootstrap compiler. So `#[cfg]` is used to only apply the change in stage 1+. As far a I know bounds cannot be made conditional with `#[cfg]`, so the entire functions are duplicated. This is unfortunate but temporary. Since this duplication makes it less obvious in the diff, the new definitions differ in: * More permissive bounds (`Thin` instead of implied `Sized`) * Different implementation * Having `rustc_allow_const_fn_unstable(const_fn_trait_bound)` * Having `rustc_allow_const_fn_unstable(ptr_metadata)`
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Extend the logic in
Pointeeprojection to ensure that we can satisfy<T as Pointee>::Metadata = ()ifT: Sized.cc: @SimonSapin and #93959