update indirect_structural_match and pointer_structural_match lints to match RFC and to show up for dependencies #120423

RalfJung · 2024-01-27T12:56:24Z

This is a large step towards implementing rust-lang/rfcs#3535.
We currently have five lints related to "the structural match situation":

nontrivial_structural_match
indirect_structural_match
pointer_structural_match
const_patterns_without_partial_eq
illegal_floating_point_literal_pattern

This PR concerns the first 3 of them. (The 4th already is set up to show for dependencies, and the 5th is removed by #116284.) nontrivial_structural_match is being removed as per the RFC; the other two are enabled to show up in dependencies.

Fixes #73448 by removing the affected analysis.

rustbot · 2024-01-27T12:56:31Z

r? @petrochenkov

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2024-01-27T12:56:33Z

Some changes might have occurred in exhaustiveness checking

cc @Nadrieril

RalfJung · 2024-01-27T12:57:56Z

tests/ui/consts/const_in_pattern/accept_corner_cases.rs

Accepting these patterns is the key change here -- we no longer plan to reject these in the future so we don't have to lint against them.

traviscross · 2024-01-27T20:36:50Z

@rustbot labels T-lang I-lang-nominated

This is part of implementing rust-lang/rfcs#3535, which we accepted. Let's nominate to verify we're OK to stabilize this piece.

@RalfJung: If there's anything beyond what is in the PR description you'd like the team to understand when considering this piece, it may be worth posting a stabilization report to that effect.

RalfJung · 2024-01-28T09:10:44Z

The nontrivial_structural_match is being removed, meaning we now accept code like this without a lint (where NoDerive is a type with a custom PartialEq):

    // The final value is fine, but statically analyzing the expression that computes
    // the value would likely (incorrectly) have us conclude that this may match on
    // values that do not have structural equality.
    const INDEX: Option<NoDerive> = [None, Some(NoDerive(10))][0];
    match None { Some(_) => panic!("whoops"), INDEX => dbg!(INDEX), };

    const fn build() -> Option<NoDerive> { None }
    const CALL: Option<NoDerive> = build();
    match None { Some(_) => panic!("whoops"), CALL => dbg!(CALL), };

    impl NoDerive { const fn none() -> Option<NoDerive> { None } }
    const METHOD_CALL: Option<NoDerive> = NoDerive::none();
    match None { Some(_) => panic!("whoops"), METHOD_CALL => dbg!(METHOD_CALL), };

The indirect_structural_match and pointer_structural_match lints detect constants that do not have structural equality according to the definition from the RFC, but are currently accepted:

indirect_structural_match detects constants involving references: due to a bug, &NotStructural values (and more generally, having a type with custom equality behind a reference) were not detected properly. We have a future-compat lint against this for many years already. This makes the lint show up in dependencies as well, in preparation for making it a hard error.
pointer_structural_match detects constants containing raw pointers and function pointers that are not just bare integers. According to the RFC, such values are not considered to have structural equality. The crater run in patterns: reject raw pointers that are not just integers #116930 found no case of the lint actually triggering. The lint is warn-by-default since Rust 1.75; this makes the lint show up in dependencies as well.

traviscross · 2024-01-31T17:12:09Z

@rustbot labels -I-lang-nominated -S-waiting-on-team

We discussed this in the triage meeting today with all members present and agreed that we want to do this. This is OK to proceed.

Thanks again to @RalfJung for pushing forward on this.

petrochenkov · 2024-01-31T20:07:20Z

@bors r

bors · 2024-01-31T20:07:24Z

📌 Commit efbfb04 has been approved by petrochenkov

It is now in the queue for this repository.

…, r=petrochenkov update indirect structural match lints to match RFC and to show up for dependencies This is a large step towards implementing rust-lang/rfcs#3535. We currently have five lints related to "the structural match situation": - nontrivial_structural_match - indirect_structural_match - pointer_structural_match - const_patterns_without_partial_eq - illegal_floating_point_literal_pattern This PR concerns the first 3 of them. (The 4th already is set up to show for dependencies, and the 5th is removed by rust-lang#116284.) nontrivial_structural_match is being removed as per the RFC; the other two are enabled to show up in dependencies. Fixes rust-lang#73448 by removing the affected analysis.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#119481 (Clarify ambiguity in select_nth_unstable docs) - rust-lang#120384 (Use `<T, U>` for array/slice equality `impl`s) - rust-lang#120423 (update indirect structural match lints to match RFC and to show up for dependencies) - rust-lang#120458 (Document `&CStr` to `CString` conversion) - rust-lang#120558 (Stop bailing out from compilation just because there were incoherent traits) - rust-lang#120572 (Update libc to 0.2.153) - rust-lang#120641 (rustdoc: trait.impl, type.impl: sort impls to make it not depend on serialization order) r? `@ghost` `@rustbot` modify labels: rollup

…, r=petrochenkov update indirect structural match lints to match RFC and to show up for dependencies This is a large step towards implementing rust-lang/rfcs#3535. We currently have five lints related to "the structural match situation": - nontrivial_structural_match - indirect_structural_match - pointer_structural_match - const_patterns_without_partial_eq - illegal_floating_point_literal_pattern This PR concerns the first 3 of them. (The 4th already is set up to show for dependencies, and the 5th is removed by rust-lang#116284.) nontrivial_structural_match is being removed as per the RFC; the other two are enabled to show up in dependencies. Fixes rust-lang#73448 by removing the affected analysis.

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#120396 (Account for unbounded type param receiver in suggestions) - rust-lang#120423 (update indirect structural match lints to match RFC and to show up for dependencies) - rust-lang#120435 (Suggest name value cfg when only value is used for check-cfg) - rust-lang#120507 (Account for non-overlapping unmet trait bounds in suggestion) - rust-lang#120520 (Some cleanups around diagnostic levels.) - rust-lang#120521 (Make `NonZero` constructors generic.) - rust-lang#120527 (Switch OwnedStore handle count to AtomicU32) - rust-lang#120550 (Continue to borrowck even if there were previous errors) - rust-lang#120575 (Simplify codegen diagnostic handling) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-02-05T16:31:16Z

☔ The latest upstream changes (presumably #120671) made this pull request unmergeable. Please resolve the merge conflicts.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#120023 (tidy: reduce allocs) - rust-lang#120396 (Account for unbounded type param receiver in suggestions) - rust-lang#120435 (Suggest name value cfg when only value is used for check-cfg) - rust-lang#120507 (Account for non-overlapping unmet trait bounds in suggestion) - rust-lang#120520 (Some cleanups around diagnostic levels.) - rust-lang#120575 (Simplify codegen diagnostic handling) - rust-lang#120670 (cleanup effect var handling) Failed merges: - rust-lang#120423 (update indirect structural match lints to match RFC and to show up for dependencies) r? `@ghost` `@rustbot` modify labels: rollup

… compat reports

and bless a test I missed

RalfJung · 2024-02-05T20:24:53Z

@bors r=petrochenkov

bors · 2024-02-05T20:24:55Z

📌 Commit e00df17 has been approved by petrochenkov

It is now in the queue for this repository.

…, r=petrochenkov update indirect structural match lints to match RFC and to show up for dependencies This is a large step towards implementing rust-lang/rfcs#3535. We currently have five lints related to "the structural match situation": - nontrivial_structural_match - indirect_structural_match - pointer_structural_match - const_patterns_without_partial_eq - illegal_floating_point_literal_pattern This PR concerns the first 3 of them. (The 4th already is set up to show for dependencies, and the 5th is removed by rust-lang#116284.) nontrivial_structural_match is being removed as per the RFC; the other two are enabled to show up in dependencies. Fixes rust-lang#73448 by removing the affected analysis.

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#119614 (unstably allow constants to refer to statics and read from immutable statics) - rust-lang#119939 (Improve 'generic param from outer item' error for `Self` and inside `static`/`const` items) - rust-lang#120206 (hir: Make sure all `HirId`s have corresponding HIR `Node`s) - rust-lang#120331 (pattern_analysis: use a plain `Vec` in `DeconstructedPat`) - rust-lang#120396 (Account for unbounded type param receiver in suggestions) - rust-lang#120423 (update indirect structural match lints to match RFC and to show up for dependencies) - rust-lang#120435 (Suggest name value cfg when only value is used for check-cfg) - rust-lang#120502 (Remove `ffi_returns_twice` feature) - rust-lang#120507 (Account for non-overlapping unmet trait bounds in suggestion) - rust-lang#120513 (Normalize type outlives obligations in NLL for new solver) r? `@ghost` `@rustbot` modify labels: rollup

…, r=petrochenkov update indirect structural match lints to match RFC and to show up for dependencies This is a large step towards implementing rust-lang/rfcs#3535. We currently have five lints related to "the structural match situation": - nontrivial_structural_match - indirect_structural_match - pointer_structural_match - const_patterns_without_partial_eq - illegal_floating_point_literal_pattern This PR concerns the first 3 of them. (The 4th already is set up to show for dependencies, and the 5th is removed by rust-lang#116284.) nontrivial_structural_match is being removed as per the RFC; the other two are enabled to show up in dependencies. Fixes rust-lang#73448 by removing the affected analysis.

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#119939 (Improve 'generic param from outer item' error for `Self` and inside `static`/`const` items) - rust-lang#120206 (hir: Make sure all `HirId`s have corresponding HIR `Node`s) - rust-lang#120331 (pattern_analysis: use a plain `Vec` in `DeconstructedPat`) - rust-lang#120396 (Account for unbounded type param receiver in suggestions) - rust-lang#120423 (update indirect structural match lints to match RFC and to show up for dependencies) - rust-lang#120435 (Suggest name value cfg when only value is used for check-cfg) - rust-lang#120502 (Remove `ffi_returns_twice` feature) - rust-lang#120507 (Account for non-overlapping unmet trait bounds in suggestion) - rust-lang#120513 (Normalize type outlives obligations in NLL for new solver) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#119939 (Improve 'generic param from outer item' error for `Self` and inside `static`/`const` items) - rust-lang#120331 (pattern_analysis: use a plain `Vec` in `DeconstructedPat`) - rust-lang#120396 (Account for unbounded type param receiver in suggestions) - rust-lang#120423 (update indirect structural match lints to match RFC and to show up for dependencies) - rust-lang#120435 (Suggest name value cfg when only value is used for check-cfg) - rust-lang#120502 (Remove `ffi_returns_twice` feature) - rust-lang#120507 (Account for non-overlapping unmet trait bounds in suggestion) - rust-lang#120513 (Normalize type outlives obligations in NLL for new solver) - rust-lang#120707 (Don't expect early-bound region to be local when reporting errors in RPITIT well-formedness) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#120423 - RalfJung:indirect-structural-match, r=petrochenkov update indirect structural match lints to match RFC and to show up for dependencies This is a large step towards implementing rust-lang/rfcs#3535. We currently have five lints related to "the structural match situation": - nontrivial_structural_match - indirect_structural_match - pointer_structural_match - const_patterns_without_partial_eq - illegal_floating_point_literal_pattern This PR concerns the first 3 of them. (The 4th already is set up to show for dependencies, and the 5th is removed by rust-lang#116284.) nontrivial_structural_match is being removed as per the RFC; the other two are enabled to show up in dependencies. Fixes rust-lang#73448 by removing the affected analysis.

Pkgsrc changes: * Adapt checksums and patches, some have beene intregrated upstream. Upstream chnages: Version 1.78.0 (2024-05-02) =========================== Language -------- - [Stabilize `#[cfg(target_abi = ...)]`] (rust-lang/rust#119590) - [Stabilize the `#[diagnostic]` namespace and `#[diagnostic::on_unimplemented]` attribute] (rust-lang/rust#119888) - [Make async-fn-in-trait implementable with concrete signatures] (rust-lang/rust#120103) - [Make matching on NaN a hard error, and remove the rest of `illegal_floating_point_literal_pattern`] (rust-lang/rust#116284) - [static mut: allow mutable reference to arbitrary types, not just slices and arrays] (rust-lang/rust#117614) - [Extend `invalid_reference_casting` to include references casting to bigger memory layout] (rust-lang/rust#118983) - [Add `non_contiguous_range_endpoints` lint for singleton gaps after exclusive ranges] (rust-lang/rust#118879) - [Add `wasm_c_abi` lint for use of older wasm-bindgen versions] (rust-lang/rust#117918) This lint currently only works when using Cargo. - [Update `indirect_structural_match` and `pointer_structural_match` lints to match RFC] (rust-lang/rust#120423) - [Make non-`PartialEq`-typed consts as patterns a hard error] (rust-lang/rust#120805) - [Split `refining_impl_trait` lint into `_reachable`, `_internal` variants] (rust-lang/rust#121720) - [Remove unnecessary type inference when using associated types inside of higher ranked `where`-bounds] (rust-lang/rust#119849) - [Weaken eager detection of cyclic types during type inference] (rust-lang/rust#119989) - [`trait Trait: Auto {}`: allow upcasting from `dyn Trait` to `dyn Auto`] (rust-lang/rust#119338) Compiler -------- - [Made `INVALID_DOC_ATTRIBUTES` lint deny by default] (rust-lang/rust#111505) - [Increase accuracy of redundant `use` checking] (rust-lang/rust#117772) - [Suggest moving definition if non-found macro_rules! is defined later] (rust-lang/rust#121130) - [Lower transmutes from int to pointer type as gep on null] (rust-lang/rust#121282) Target changes: - [Windows tier 1 targets now require at least Windows 10] (rust-lang/rust#115141) - [Enable CMPXCHG16B, SSE3, SAHF/LAHF and 128-bit Atomics in tier 1 Windows] (rust-lang/rust#120820) - [Add `wasm32-wasip1` tier 2 (without host tools) target] (rust-lang/rust#120468) - [Add `wasm32-wasip2` tier 3 target] (rust-lang/rust#119616) - [Rename `wasm32-wasi-preview1-threads` to `wasm32-wasip1-threads`] (rust-lang/rust#122170) - [Add `arm64ec-pc-windows-msvc` tier 3 target] (rust-lang/rust#119199) - [Add `armv8r-none-eabihf` tier 3 target for the Cortex-R52] (rust-lang/rust#110482) - [Add `loongarch64-unknown-linux-musl` tier 3 target] (rust-lang/rust#121832) Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. Libraries --------- - [Bump Unicode to version 15.1.0, regenerate tables] (rust-lang/rust#120777) - [Make align_offset, align_to well-behaved in all cases] (rust-lang/rust#121201) - [PartialEq, PartialOrd: document expectations for transitive chains] (rust-lang/rust#115386) - [Optimize away poison guards when std is built with panic=abort] (rust-lang/rust#100603) - [Replace pthread `RwLock` with custom implementation] (rust-lang/rust#110211) - [Implement unwind safety for Condvar on all platforms] (rust-lang/rust#121768) - [Add ASCII fast-path for `char::is_grapheme_extended`] (rust-lang/rust#121138) Stabilized APIs --------------- - [`impl Read for &Stdin`] (https://doc.rust-lang.org/stable/std/io/struct.Stdin.html#impl-Read-for-&Stdin) - [Accept non `'static` lifetimes for several `std::error::Error` related implementations] (rust-lang/rust#113833) - [Make `impl<Fd: AsFd>` impl take `?Sized`] (rust-lang/rust#114655) - [`impl From<TryReserveError> for io::Error`] (https://doc.rust-lang.org/stable/std/io/struct.Error.html#impl-From-for-Error) These APIs are now stable in const contexts: - [`Barrier::new()`] (https://doc.rust-lang.org/stable/std/sync/struct.Barrier.html#method.new) Cargo ----- - [Stabilize lockfile v4](rust-lang/cargo#12852) - [Respect `rust-version` when generating lockfile] (rust-lang/cargo#12861) - [Control `--charset` via auto-detecting config value] (rust-lang/cargo#13337) - [Support `target.<triple>.rustdocflags` officially] (rust-lang/cargo#13197) - [Stabilize global cache data tracking] (rust-lang/cargo#13492) Misc ---- - [rustdoc: add `--test-builder-wrapper` arg to support wrappers such as RUSTC_WRAPPER when building doctests] (rust-lang/rust#114651) Compatibility Notes ------------------- - [Many unsafe precondition checks now run for user code with debug assertions enabled] (rust-lang/rust#120863) This change helps users catch undefined behavior in their code, though the details of how much is checked are generally not stable. - [riscv only supports split_debuginfo=off for now] (rust-lang/rust#120518) - [Consistently check bounds on hidden types of `impl Trait`] (rust-lang/rust#121679) - [Change equality of higher ranked types to not rely on subtyping] (rust-lang/rust#118247) - [When called, additionally check bounds on normalized function return type] (rust-lang/rust#118882) - [Expand coverage for `arithmetic_overflow` lint] (rust-lang/rust#119432) 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. - [Update to LLVM 18](rust-lang/rust#120055) - [Build `rustc` with 1CGU on `x86_64-pc-windows-msvc`] (rust-lang/rust#112267) - [Build `rustc` with 1CGU on `x86_64-apple-darwin`] (rust-lang/rust#112268) - [Introduce `run-make` V2 infrastructure, a `run_make_support` library and port over 2 tests as example] (rust-lang/rust#113026) - [Windows: Implement condvar, mutex and rwlock using futex] (rust-lang/rust#121956)

rustbot assigned petrochenkov Jan 27, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 27, 2024

RalfJung mentioned this pull request Jan 27, 2024

Tracking Issue for RFC 3535: Constants in Patterns #120362

Closed

8 tasks

RalfJung commented Jan 27, 2024

View reviewed changes

This comment has been minimized.

Sign in to view

rustbot added I-lang-nominated The issue / PR has been nominated for discussion during a lang team meeting. T-lang Relevant to the language team, which will review and decide on the PR/issue. labels Jan 27, 2024

RalfJung force-pushed the indirect-structural-match branch from 2f0737d to efbfb04 Compare January 28, 2024 09:04

petrochenkov added S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 29, 2024

rustbot removed I-lang-nominated The issue / PR has been nominated for discussion during a lang team meeting. S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). labels Jan 31, 2024

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 31, 2024

matthiaskrgr mentioned this pull request Feb 3, 2024

Rollup of 7 pull requests #120622

Closed

matthiaskrgr mentioned this pull request Feb 4, 2024

Rollup of 8 pull requests #120653

Closed

matthiaskrgr mentioned this pull request Feb 4, 2024

Rollup of 7 pull requests #120654

Closed

matthiaskrgr mentioned this pull request Feb 5, 2024

Rollup of 9 pull requests #120662

Closed

matthiaskrgr mentioned this pull request Feb 5, 2024

Rollup of 7 pull requests #120679

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 5, 2024

RalfJung added 4 commits February 5, 2024 20:36

get rid of nontrivial_structural_match lint and custom_eq const qualif

9f58cf4

show indirect_structural_match and pointer_structural_match in future…

48abca7

… compat reports

update the tracking issue for structural match violations

45d01b8

and bless a test I missed

merge the accepted-structural-match tests into one

e00df17

RalfJung force-pushed the indirect-structural-match branch from efbfb04 to e00df17 Compare February 5, 2024 19:36

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 5, 2024

matthiaskrgr mentioned this pull request Feb 6, 2024

Rollup of 10 pull requests #120709

Closed

matthiaskrgr mentioned this pull request Feb 6, 2024

Rollup of 9 pull requests #120714

Closed

matthiaskrgr mentioned this pull request Feb 6, 2024

Rollup of 9 pull requests #120722

Merged

bors merged commit 176c4ba into rust-lang:master Feb 7, 2024
11 checks passed

rustbot added this to the 1.78.0 milestone Feb 7, 2024

RalfJung deleted the indirect-structural-match branch February 8, 2024 06:55

RalfJung mentioned this pull request Feb 8, 2024

Make pointer_structural_match normal and warn #110166

Closed

RalfJung changed the title ~~update indirect structural match lints to match RFC and to show up for dependencies~~ update indirect_structural_match and pointer_structural_match lints to match RFC and to show up for dependencies Feb 14, 2024

RalfJung added the relnotes Marks issues that should be documented in the release notes of the next release. label Mar 8, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update indirect_structural_match and pointer_structural_match lints to match RFC and to show up for dependencies #120423

update indirect_structural_match and pointer_structural_match lints to match RFC and to show up for dependencies #120423

RalfJung commented Jan 27, 2024 •

edited

Loading

rustbot commented Jan 27, 2024

rustbot commented Jan 27, 2024

RalfJung Jan 27, 2024

This comment has been minimized.

traviscross commented Jan 27, 2024

RalfJung commented Jan 28, 2024 •

edited

Loading

traviscross commented Jan 31, 2024

petrochenkov commented Jan 31, 2024

bors commented Jan 31, 2024

bors commented Feb 5, 2024

RalfJung commented Feb 5, 2024

bors commented Feb 5, 2024

update indirect_structural_match and pointer_structural_match lints to match RFC and to show up for dependencies #120423

update indirect_structural_match and pointer_structural_match lints to match RFC and to show up for dependencies #120423

Conversation

RalfJung commented Jan 27, 2024 • edited Loading

rustbot commented Jan 27, 2024

rustbot commented Jan 27, 2024

RalfJung Jan 27, 2024

Choose a reason for hiding this comment

This comment has been minimized.

traviscross commented Jan 27, 2024

RalfJung commented Jan 28, 2024 • edited Loading

traviscross commented Jan 31, 2024

petrochenkov commented Jan 31, 2024

bors commented Jan 31, 2024

bors commented Feb 5, 2024

RalfJung commented Feb 5, 2024

bors commented Feb 5, 2024

RalfJung commented Jan 27, 2024 •

edited

Loading

RalfJung commented Jan 28, 2024 •

edited

Loading