-
Notifications
You must be signed in to change notification settings - Fork 13.6k
Finalize repeat expr inference behaviour with inferred repeat counts #139635
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Finalize repeat expr inference behaviour with inferred repeat counts #139635
Conversation
}; | ||
|
||
for (element, element_ty, count) in deferred_repeat_expr_checks { | ||
match count.kind() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I changed this to an explicit match instead of the to_target_usize().is_none_or()
as the is_none_or
felt like somewhat subtle logic given the soundness sensitive nature of how we should be handling each variant 🤔
Background contextI would like to move forwards with stabilizing fn foo(a: &mut [u8; 32]) {
*a = [10; _];
} This introduces some complexities around handling the check that the element type implements
Forbid
|
Team member @BoxyUwU has proposed to merge this. The next step is review by the rest of the tagged team members: No concerns currently listed. Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up! See this document for info about what commands tagged team members can give me. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gamer
To my understanding this will not be necessary once we have stable marker traits, will it? At this point we could have #[marker]
trait NonConstValueRepeatExpr {}
impl<T: Copy, const N: usize> ValidRepeatExpr for [T; N] {}
impl<T> ValidRepeatExpr for [T; 0] {}
impl<T> ValidRepeatExpr for [T; 1] {} This would then need some diagnostics handling/ Given that marker traits aren't stable and their stabilization is blocked on the next-generation trait solver, I feel happy with this current approach of deferring them in HIR typeck. @rfcbot reviewed |
Indeed, "add a new obligation for repeat expr checks" can be replaced with "add a lang item'd trait in core" one day. should have put that in the FCP :) |
be56470
to
6296fda
Compare
☔ The latest upstream changes (presumably #140415) made this pull request unmergeable. Please resolve the merge conflicts. |
Reading through the summary (btw @BoxyUwU very nice), I was fairly concerned about special casing deferring Copy. But, given that it seems like the principled solution is marker traits, and I think that's something we will eventually get to, I'm okay with this. I would like a FIXME or an issue opened something so we have some way to know to come back to this with marker traits. But, checking my box. |
🔔 This is now entering its final comment period, as per the review above. 🔔 |
I'll make sure to open an issue once the FCP completes 🤔 and probably add a FIXME(#18439339393) in the source where we check the deferred checks |
186099c
to
def6263
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
r=me after nits
def6263
to
cc10370
Compare
@bors r=lcnr |
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#135562 (Add ignore value suggestion in closure body) - rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts) - rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds) - rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths) - rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts) - rust-lang#141130 (rustc_on_unimplemented cleanups) - rust-lang#141286 (Querify `coroutine_hidden_types`) Failed merges: - rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#139635 - BoxyUwU:no_order_dependent_copy_checks, r=lcnr Finalize repeat expr inference behaviour with inferred repeat counts I believe this should be the last change of how repeat exprs are handled before it's finished for `generic_arg_infer`. Assuming we don't wind up deciding to replace this all with a new predicate kind :) This PR has three actual changes: - Always defer the checks to end of typeck even when generic arg infer is not enabled (needs an FCP) - Properly handle element exprs that are constants when the repeat count is inferred - "Isolate" each repeat expr check so that inference constraints from `Copy` goals dont affect other repeat expr checks resulting in weird order-dependent inference The commit history and tests should be relatively helpful for understanding this PR's impl. r? compiler-errors
I believe this caused a regression on nightly. See https://github.com/aya-rs/aya/actions/runs/15223453504/job/42822502727.
Oddly, this seems specific to rustdoc. |
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#135562 (Add ignore value suggestion in closure body) - rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts) - rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds) - rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths) - rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts) - rust-lang#141130 (rustc_on_unimplemented cleanups) - rust-lang#141286 (Querify `coroutine_hidden_types`) Failed merges: - rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs) r? `@ghost` `@rustbot` modify labels: rollup
Pkgsrc changes: * Adjust patches to adapt to upstream changes and new versions. * assosicated checksums Upstream changes relative to 1.88.0: Version 1.89.0 (2025-08-07) ========================== Language -------- - [Stabilize explicitly inferred const arguments (`feature(generic_arg_infer)`)] (rust-lang/rust#141610) - [Add a warn-by-default `mismatched_lifetime_syntaxes` lint.] (rust-lang/rust#138677) This lint detects when the same lifetime is referred to by different syntax categories between function arguments and return values, which can be confusing to read, especially in unsafe code. This lint supersedes the warn-by-default `elided_named_lifetimes` lint. - [Expand `unpredictable_function_pointer_comparisons` to also lint on function pointer comparisons in external macros] (rust-lang/rust#134536) - [Make the `dangerous_implicit_autorefs` lint deny-by-default] (rust-lang/rust#141661) - [Stabilize the avx512 target features] (rust-lang/rust#138940) - [Stabilize `kl` and `widekl` target features for x86] (rust-lang/rust#140766) - [Stabilize `sha512`, `sm3` and `sm4` target features for x86] (rust-lang/rust#140767) - [Stabilize LoongArch target features `f`, `d`, `frecipe`, `lasx`, `lbt`, `lsx`, and `lvz`] (rust-lang/rust#135015) - [Remove `i128` and `u128` from `improper_ctypes_definitions`] (rust-lang/rust#137306) - [Stabilize `repr128` (`#[repr(u128)]`, `#[repr(i128)]`)] (rust-lang/rust#138285) - [Allow `#![doc(test(attr(..)))]` everywhere] (rust-lang/rust#140560) - [Extend temporary lifetime extension to also go through tuple struct and tuple variant constructors] (rust-lang/rust#140593) Compiler -------- - [Default to non-leaf frame pointers on aarch64-linux] (rust-lang/rust#140832) - [Enable non-leaf frame pointers for Arm64EC Windows] (rust-lang/rust#140862) - [Set Apple frame pointers by architecture] (rust-lang/rust#141797) Platform Support ---------------- - [Add new Tier-3 targets `loongarch32-unknown-none` and `loongarch32-unknown-none-softfloat`] (rust-lang/rust#142053) Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. [platform-support-doc]: https://doc.rust-lang.org/rustc/platform-support.html Libraries --------- - [Specify the base path for `file!`] (rust-lang/rust#134442) - [Allow storing `format_args!()` in a variable] (rust-lang/rust#140748) - [Add `#[must_use]` to `[T; N]::map`] (rust-lang/rust#140957) - [Implement `DerefMut` for `Lazy{Cell,Lock}`] (rust-lang/rust#129334) - [Implement `Default` for `array::IntoIter`] (rust-lang/rust#141574) - [Implement `Clone` for `slice::ChunkBy`] (rust-lang/rust#138016) - [Implement `io::Seek` for `io::Take`] (rust-lang/rust#138023) Stabilized APIs --------------- - [`NonZero<char>`] (https://doc.rust-lang.org/stable/std/num/struct.NonZero.html) - Many intrinsics for x86, not enumerated here - [AVX512 intrinsics](rust-lang/rust#111137) - [`SHA512`, `SM3` and `SM4` intrinsics] (rust-lang/rust#126624) - [`File::lock`] (https://doc.rust-lang.org/stable/std/fs/struct.File.html#method.lock) - [`File::lock_shared`] (https://doc.rust-lang.org/stable/std/fs/struct.File.html#method.lock_shared) - [`File::try_lock`] (https://doc.rust-lang.org/stable/std/fs/struct.File.html#method.try_lock) - [`File::try_lock_shared`] (https://doc.rust-lang.org/stable/std/fs/struct.File.html#method.try_lock_shared) - [`File::unlock`] (https://doc.rust-lang.org/stable/std/fs/struct.File.html#method.unlock) - [`NonNull::from_ref`] (https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.from_ref) - [`NonNull::from_mut`] (https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.from_mut) - [`NonNull::without_provenance`] (https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.without_provenance) - [`NonNull::with_exposed_provenance`] (https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.with_exposed_provenance) - [`NonNull::expose_provenance`] (https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.expose_provenance) - [`OsString::leak`] (https://doc.rust-lang.org/stable/std/ffi/struct.OsString.html#method.leak) - [`PathBuf::leak`] (https://doc.rust-lang.org/stable/std/path/struct.PathBuf.html#method.leak) - [`Result::flatten`] (https://doc.rust-lang.org/stable/std/result/enum.Result.html#method.flatten) - [`std::os::linux::net::TcpStreamExt::quickack`] (https://doc.rust-lang.org/stable/std/os/linux/net/trait.TcpStreamExt.html#tymethod.quickack) - [`std::os::linux::net::TcpStreamExt::set_quickack`] (https://doc.rust-lang.org/stable/std/os/linux/net/trait.TcpStreamExt.html#tymethod.set_quickack) These previously stable APIs are now stable in const contexts: - [`<[T; N]>::as_mut_slice`] (https://doc.rust-lang.org/stable/std/primitive.array.html#method.as_mut_slice) - [`<[u8]>::eq_ignore_ascii_case`] (https://doc.rust-lang.org/stable/std/primitive.slice.html#impl-%5Bu8%5D/method.eq_ignore_ascii_case) - [`str::eq_ignore_ascii_case`] (https://doc.rust-lang.org/stable/std/primitive.str.html#impl-str/method.eq_ignore_ascii_case) Cargo ----- - [`cargo fix` and `cargo clippy --fix` now default to the same Cargo target selection as other build commands.] (rust-lang/cargo#15192) Previously it would apply to all targets (like binaries, examples, tests, etc.). The `--edition` flag still applies to all targets. - [Stabilize doctest-xcompile.] (rust-lang/cargo#15462) Doctests are now tested when cross-compiling. Just like other tests, it will use the [`runner` setting] (https://doc.rust-lang.org/cargo/reference/config.html#targettriplerunner) to run the tests. If you need to disable tests for a target, you can use the [ignore doctest attribute] (https://doc.rust-lang.org/rustdoc/write-documentation/documentation-tests.html#ignoring-targets) to specify the targets to ignore. Rustdoc ----- - [On mobile, make the sidebar full width and linewrap] (rust-lang/rust#139831). This makes long section and item names much easier to deal with on mobile. Compatibility Notes ------------------- - [Make `missing_fragment_specifier` an unconditional error] (rust-lang/rust#128425) - [Enabling the `neon` target feature on `aarch64-unknown-none-softfloat` causes a warning] (rust-lang/rust#135160) because mixing code with and without that target feature is not properly supported by LLVM - [Sized Hierarchy: Part I](rust-lang/rust#137944) - Introduces a small breaking change affecting `?Sized` bounds on impls on recursive types which contain associated type projections. It is not expected to affect any existing published crates. Can be fixed by refactoring the involved types or opting into the `sized_hierarchy` unstable feature. See the [FCP report] (rust-lang/rust#137944 (comment)) for a code example. - The warn-by-default `elided_named_lifetimes` lint is [superseded by the warn-by-default `mismatched_lifetime_syntaxes` lint.] (rust-lang/rust#138677) - [Error on recursive opaque types earlier in the type checker] (rust-lang/rust#139419) - [Type inference side effects from requiring element types of array repeat expressions are `Copy` are now only available at the end of type checking] (rust-lang/rust#139635) - [The deprecated accidentally-stable `std::intrinsics::{copy,copy_nonoverlapping,write_bytes}` are now proper intrinsics] (rust-lang/rust#139916). There are no debug assertions guarding against UB, and they cannot be coerced to function pointers. - [Remove long-deprecated `std::intrinsics::drop_in_place`] (rust-lang/rust#140151) - [Make well-formedness predicates no longer coinductive] (rust-lang/rust#140208) - [Remove hack when checking impl method compatibility] (rust-lang/rust#140557) - [Remove unnecessary type inference due to built-in trait object impls] (rust-lang/rust#141352) - [Lint against "stdcall", "fastcall", and "cdecl" on non-x86-32 targets] (rust-lang/rust#141435) - [Future incompatibility warnings relating to the never type (`!`) are now reported in dependencies] (rust-lang/rust#141937) - [Ensure `std::ptr::copy_*` intrinsics also perform the static self-init checks] (rust-lang/rust#142575) Internal Changes ---------------- These changes do not affect any public interfaces of Rust, but they represent significant improvements to the performance or internals of rustc and related tools. - [Correctly un-remap compiler sources paths with the `rustc-dev` component] (rust-lang/rust#142377)
I believe this should be the last change of how repeat exprs are handled before it's finished for
generic_arg_infer
. Assuming we don't wind up deciding to replace this all with a new predicate kind :)This PR has three actual changes:
Copy
goals dont affect other repeat expr checks resulting in weird order-dependent inferenceThe commit history and tests should be relatively helpful for understanding this PR's impl.
r? compiler-errors