Skip to content

Move polarity into PolyTraitRef rather than storing it on the side#131652

Merged
bors merged 2 commits intorust-lang:masterfrom
compiler-errors:modifiers
Oct 15, 2024
Merged

Move polarity into PolyTraitRef rather than storing it on the side#131652
bors merged 2 commits intorust-lang:masterfrom
compiler-errors:modifiers

Conversation

@compiler-errors
Copy link
Contributor

@compiler-errors compiler-errors commented Oct 13, 2024

Arguably we could move these modifiers into TraitRef instead of PolyTraitRef, but I see TraitRef as simply the path part of the trait ref. It doesn't really matter -- refactoring this further is much easier now.

@rustbot
Copy link
Collaborator

rustbot commented Oct 13, 2024

r? @Nadrieril

rustbot has assigned @Nadrieril.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Oct 13, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 13, 2024

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

HIR ty lowering was modified

cc @fmease

@compiler-errors compiler-errors force-pushed the modifiers branch 2 times, most recently from 61b9dca to ad43c2e Compare October 13, 2024 14:11
@compiler-errors compiler-errors mentioned this pull request Oct 13, 2024
Merged
Nadrieril
Nadrieril approved these changes Oct 13, 2024
View reviewed changes
Copy link
Member

@Nadrieril Nadrieril left a comment

Choose a reason for hiding this comment

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

Looks reasonable and like a nice improvement! I lack all context particularly for the first commit though so I'll let someone more knowledgeable call this.

r? compiler

@rustbot rustbot assigned chenyukang and unassigned Nadrieril Oct 13, 2024
@chenyukang
Copy link
Member

chenyukang commented Oct 14, 2024

r? compiler

@rustbot rustbot assigned jieyouxu and unassigned chenyukang Oct 14, 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.

Looks reasonable to me as well. As to removing the hack, if no tests fail then I think we're good 🤷 You can r=Nadrieril and me after a rebase.

@jieyouxu
Copy link
Member

jieyouxu commented Oct 14, 2024

@rustbot author

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

bors commented Oct 14, 2024

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

@compiler-errors
Copy link
Contributor Author

compiler-errors commented Oct 14, 2024

@bors r=Nadrieril,jieyouxu

@bors
Copy link
Collaborator

bors commented Oct 14, 2024

📌 Commit 95dba28 has been approved by Nadrieril,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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 14, 2024
@compiler-errors compiler-errors mentioned this pull request Oct 14, 2024
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 14, 2024
@matthiaskrgr
Rollup merge of rust-lang#131652 - compiler-errors:modifiers, r=Nadri…
c81bfda 
…eril,jieyouxu

Move polarity into `PolyTraitRef` rather than storing it on the side

Arguably we could move these modifiers into `TraitRef` instead of `PolyTraitRef`, but I see `TraitRef` as simply the *path* part of the trait ref. It doesn't really matter -- refactoring this further is much easier now.
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 14, 2024
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 14, 2024
@matthiaskrgr
Rollup merge of rust-lang#131652 - compiler-errors:modifiers, r=Nadri…
32beeaf 
…eril,jieyouxu

Move polarity into `PolyTraitRef` rather than storing it on the side

Arguably we could move these modifiers into `TraitRef` instead of `PolyTraitRef`, but I see `TraitRef` as simply the *path* part of the trait ref. It doesn't really matter -- refactoring this further is much easier now.
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 14, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 15, 2024
@bors
Auto merge of rust-lang#131711 - matthiaskrgr:rollup-an3kr9k, r=matth…
eed0e12 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#122670 (Fix bug where `option_env!` would return `None` when env var is present but not valid Unicode)
 - rust-lang#130568 (Make some float methods unstable `const fn`)
 - rust-lang#131137 (Add 1.82 release notes)
 - rust-lang#131328 (Remove unnecessary sorts in `rustc_hir_analysis`)
 - rust-lang#131652 (Move polarity into `PolyTraitRef` rather than storing it on the side)
 - rust-lang#131675 (Update lint message for ABI not supported)
 - rust-lang#131681 (Fix up-to-date checking for run-make tests)
 - rust-lang#131703 (Resolved python deprecation warning in publish_toolstate.py)
 - rust-lang#131706 (Fix two const-hacks)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 15, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 15, 2024
@bors
Auto merge of rust-lang#131723 - matthiaskrgr:rollup-krcslig, r=matth…
354ded4 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#122670 (Fix bug where `option_env!` would return `None` when env var is present but not valid Unicode)
 - rust-lang#131095 (Use environment variables instead of command line arguments for merged doctests)
 - rust-lang#131339 (Expand set_ptr_value / with_metadata_of docs)
 - rust-lang#131652 (Move polarity into `PolyTraitRef` rather than storing it on the side)
 - rust-lang#131675 (Update lint message for ABI not supported)
 - rust-lang#131681 (Fix up-to-date checking for run-make tests)
 - rust-lang#131702 (Suppress import errors for traits that couldve applied for method lookup error)
 - rust-lang#131703 (Resolved python deprecation warning in publish_toolstate.py)
 - rust-lang#131710 (Remove `'apostrophes'` from `rustc_parse_format`)

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

Rollup of 9 pull requests

Successful merges:

 - rust-lang#122670 (Fix bug where `option_env!` would return `None` when env var is present but not valid Unicode)
 - rust-lang#131095 (Use environment variables instead of command line arguments for merged doctests)
 - rust-lang#131339 (Expand set_ptr_value / with_metadata_of docs)
 - rust-lang#131652 (Move polarity into `PolyTraitRef` rather than storing it on the side)
 - rust-lang#131675 (Update lint message for ABI not supported)
 - rust-lang#131681 (Fix up-to-date checking for run-make tests)
 - rust-lang#131702 (Suppress import errors for traits that couldve applied for method lookup error)
 - rust-lang#131703 (Resolved python deprecation warning in publish_toolstate.py)
 - rust-lang#131710 (Remove `'apostrophes'` from `rustc_parse_format`)

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

Rollup of 9 pull requests

Successful merges:

 - rust-lang#122670 (Fix bug where `option_env!` would return `None` when env var is present but not valid Unicode)
 - rust-lang#131095 (Use environment variables instead of command line arguments for merged doctests)
 - rust-lang#131339 (Expand set_ptr_value / with_metadata_of docs)
 - rust-lang#131652 (Move polarity into `PolyTraitRef` rather than storing it on the side)
 - rust-lang#131675 (Update lint message for ABI not supported)
 - rust-lang#131681 (Fix up-to-date checking for run-make tests)
 - rust-lang#131702 (Suppress import errors for traits that couldve applied for method lookup error)
 - rust-lang#131703 (Resolved python deprecation warning in publish_toolstate.py)
 - rust-lang#131710 (Remove `'apostrophes'` from `rustc_parse_format`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4d53a28 into rust-lang:master Oct 15, 2024
@rustbot rustbot added this to the 1.84.0 milestone Oct 15, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 15, 2024
@rust-timer
Unrolled build for rust-lang#131652
70f991b 
Rollup merge of rust-lang#131652 - compiler-errors:modifiers, r=Nadrieril,jieyouxu

Move polarity into `PolyTraitRef` rather than storing it on the side

Arguably we could move these modifiers into `TraitRef` instead of `PolyTraitRef`, but I see `TraitRef` as simply the *path* part of the trait ref. It doesn't really matter -- refactoring this further is much easier now.
flip1995 pushed a commit to flip1995/rust that referenced this pull request Oct 18, 2024
@bors
Auto merge of rust-lang#131723 - matthiaskrgr:rollup-krcslig, r=matth…
c16ba35 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#122670 (Fix bug where `option_env!` would return `None` when env var is present but not valid Unicode)
 - rust-lang#131095 (Use environment variables instead of command line arguments for merged doctests)
 - rust-lang#131339 (Expand set_ptr_value / with_metadata_of docs)
 - rust-lang#131652 (Move polarity into `PolyTraitRef` rather than storing it on the side)
 - rust-lang#131675 (Update lint message for ABI not supported)
 - rust-lang#131681 (Fix up-to-date checking for run-make tests)
 - rust-lang#131702 (Suppress import errors for traits that couldve applied for method lookup error)
 - rust-lang#131703 (Resolved python deprecation warning in publish_toolstate.py)
 - rust-lang#131710 (Remove `'apostrophes'` from `rustc_parse_format`)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

@Nadrieril Nadrieril Nadrieril approved these changes

Assignees

@jieyouxu jieyouxu

Labels

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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.84.0

Development

Successfully merging this pull request may close these issues.

6 participants

@compiler-errors @rustbot @chenyukang @jieyouxu @bors @Nadrieril