Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Also use outermost const-anon for impl items in non_local_defs lint #131660

Merged
merged 1 commit into from
Oct 14, 2024
Merged

Also use outermost const-anon for impl items in non_local_defs lint #131660

merged 1 commit into from
Oct 14, 2024

Conversation

Urgau
Copy link
Member

@Urgau Urgau commented Oct 13, 2024

This PR update the logic for the impl paths (items) in the non_local_definitions lint to also consider const-anon in case the impl definition is wrapped inside const-anon it-self wrapped into a const-anon where the items are.

r? @jieyouxu (since you interacted on the issue)
Fixes (after beta-backport) #131643

@rustbot 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 Oct 13, 2024
jieyouxu
jieyouxu approved these changes Oct 14, 2024
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! This LGTM, though I almost feel like we are playing whack-a-mole. Oh well.

@jieyouxu
Copy link
Member

ferrisCatRPlusRollup-200px

@bors
Copy link
Contributor

bors commented Oct 14, 2024

📌 Commit b5e91a0 has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 14, 2024
@jieyouxu
Copy link
Member

Nominating for beta backport to fix non_local_definitions lint that should not have fired on cases like #131643

const _: () = {
    const _: () = {
        impl Callable for Dummy {}
    };
    pub trait Callable {}
    struct Dummy;
};

@rustbot label +beta-nominated

@rustbot rustbot added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 14, 2024
@jieyouxu jieyouxu mentioned this pull request Oct 14, 2024
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 14, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 14, 2024
@bors
Auto merge of rust-lang#131672 - matthiaskrgr:rollup-gyzysj4, r=matth…
5a50ebf 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#128967 (std::fs::get_path freebsd update.)
 - rust-lang#130629 (core/net: add Ipv[46]Addr::from_octets, Ipv6Addr::from_segments.)
 - rust-lang#131274 (library: Const-stabilize `MaybeUninit::assume_init_mut`)
 - rust-lang#131473 (compiler: `{TyAnd,}Layout` comes home)
 - rust-lang#131533 (emscripten: Use the latest emsdk 3.1.68)
 - rust-lang#131593 (miri: avoid cloning AllocExtra)
 - rust-lang#131616 (merge const_ipv4 / const_ipv6 feature gate into 'ip' feature gate)
 - rust-lang#131660 (Also use outermost const-anon for impl items in `non_local_defs` lint)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 14, 2024
@bors
Auto merge of rust-lang#131672 - matthiaskrgr:rollup-gyzysj4, r=matth…
bcbbea8 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#128967 (std::fs::get_path freebsd update.)
 - rust-lang#130629 (core/net: add Ipv[46]Addr::from_octets, Ipv6Addr::from_segments.)
 - rust-lang#131274 (library: Const-stabilize `MaybeUninit::assume_init_mut`)
 - rust-lang#131473 (compiler: `{TyAnd,}Layout` comes home)
 - rust-lang#131533 (emscripten: Use the latest emsdk 3.1.68)
 - rust-lang#131593 (miri: avoid cloning AllocExtra)
 - rust-lang#131616 (merge const_ipv4 / const_ipv6 feature gate into 'ip' feature gate)
 - rust-lang#131660 (Also use outermost const-anon for impl items in `non_local_defs` lint)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 14, 2024
@bors
Auto merge of rust-lang#131672 - matthiaskrgr:rollup-gyzysj4, r=matth…
17a19e6 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#128967 (std::fs::get_path freebsd update.)
 - rust-lang#130629 (core/net: add Ipv[46]Addr::from_octets, Ipv6Addr::from_segments.)
 - rust-lang#131274 (library: Const-stabilize `MaybeUninit::assume_init_mut`)
 - rust-lang#131473 (compiler: `{TyAnd,}Layout` comes home)
 - rust-lang#131533 (emscripten: Use the latest emsdk 3.1.68)
 - rust-lang#131593 (miri: avoid cloning AllocExtra)
 - rust-lang#131616 (merge const_ipv4 / const_ipv6 feature gate into 'ip' feature gate)
 - rust-lang#131660 (Also use outermost const-anon for impl items in `non_local_defs` lint)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d34b932 into rust-lang:master Oct 14, 2024
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 14, 2024
@rust-timer
Unrolled build for rust-lang#131660
f5dcfd1 
Rollup merge of rust-lang#131660 - Urgau:non_local_def-131643, r=jieyouxu

Also use outermost const-anon for impl items in `non_local_defs` lint

This PR update the logic for the impl paths (items) in the `non_local_definitions` lint to also consider const-anon in case the impl definition is wrapped inside const-anon it-self wrapped into a const-anon where the items are.

r? `@jieyouxu` *(since you interacted on the issue)*
Fixes *(after beta-backport)* rust-lang#131643
@rustbot rustbot added this to the 1.84.0 milestone Oct 14, 2024
@apiraino
Copy link
Contributor

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle.

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 17, 2024
@cuviper cuviper mentioned this pull request Oct 17, 2024
Merged
@cuviper cuviper modified the milestones: 1.84.0, 1.83.0 Oct 17, 2024
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 17, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 18, 2024
@bors
Auto merge of rust-lang#131846 - cuviper:beta-next, r=cuviper
88c1c3c 
[beta] stage0 bump and backports

- Bump stage0 to 1.82.0
- Clippy: Move `too_long_first_doc_paragraph` to `nursery` rust-lang#131742
- Also use outermost const-anon for impl items in `non_local_defs` lint rust-lang#131660

r? ghost
@jieyouxu jieyouxu added the L-non_local_definitions Lint: non_local_definitions label Nov 1, 2024
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. L-non_local_definitions Lint: non_local_definitions S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.83.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Urgau @jieyouxu @bors @apiraino @cuviper @rustbot