Skip to content

A few more "predicate"-to-"clause" renamings - #160177

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
ada4a:push-xmqwrrzvqlny
Jul 31, 2026
Merged

A few more "predicate"-to-"clause" renamings#160177
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
ada4a:push-xmqwrrzvqlny

Conversation

@ada4a

@ada4a ada4a commented Jul 29, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Follow-up to #159990. This should cover all the files that I didn't get to reviewing in that PR.

r? @nnethercote
cc @oli-obk

@rustbot

rustbot commented Jul 29, 2026

Copy link
Copy Markdown
Collaborator

clippy is developed in its own repository. If possible, consider making this change to rust-lang/rust-clippy instead.

cc @rust-lang/clippy

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. 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 Jul 29, 2026
ada4a
ada4a commented Jul 29, 2026
View reviewed changes
Comment thread compiler/rustc_trait_selection/src/traits/dyn_compatibility.rs
Comment on lines 727 to +731
let meta_sized_predicate = {
let meta_sized_did = tcx.require_lang_item(LangItem::MetaSized, DUMMY_SP);
ty::TraitRef::new(tcx, meta_sized_did, [unsized_self_ty]).upcast(tcx)
ty::TraitRef::new(tcx, meta_sized_did, [unsized_self_ty])
};
clauses.push(meta_sized_predicate);
clauses.push(meta_sized_predicate.upcast(tcx));

@ada4a ada4a Jul 29, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The reason I did it like this, as opposed to just renaming meta_sized_predicate, is that this matches what's done with the variables above: the variable is called *_predicate, created using TraitRef::new, and upcasted inside the call to clauses.push()

View changes since the review

@ada4a
ada4a force-pushed the push-xmqwrrzvqlny branch from 93e8680 to a66e7fe Compare July 29, 2026 19:37
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@ada4a
A few more "predicate"-to-"clause" renamings
952cbef 
Follow-up to rust-lang#159990. This should
cover all the files that I didn't get to reviewing in that PR.
@ada4a
ada4a force-pushed the push-xmqwrrzvqlny branch from a66e7fe to 952cbef Compare July 29, 2026 21:57
nnethercote
nnethercote approved these changes Jul 30, 2026
View reviewed changes

@nnethercote nnethercote left a comment •
edited by rustbot
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This all looks good. Only question: is it worth fixing the FIXMEs here as well?

View changes since this review

@ada4a

ada4a commented Jul 30, 2026

Copy link
Copy Markdown
Contributor Author

The problem is that that would need to start by renaming OutlivesPredicate to OutlivesClause, and that type is present in rustc_public.. so we'll need to be careful here. Also, I did start doing that in a test branch, and just some trivial renamings result in a 300-line diff already – so I think it definitely deserves its own PR.

@nnethercote

nnethercote commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

Fair enough.

@bors r+ rollup

@rust-bors

rust-bors Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 952cbef has been approved by nnethercote

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Jul 30, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jul 30, 2026
@JonathanBrouwer
Rollup merge of rust-lang#160177 - ada4a:push-xmqwrrzvqlny, r=nnether…
dfd46d4 
…cote

A few more "predicate"-to-"clause" renamings

Follow-up to rust-lang#159990. This should cover all the files that I didn't get to reviewing in that PR.

r? @nnethercote
cc @oli-obk
@JonathanBrouwer JonathanBrouwer mentioned this pull request Jul 30, 2026
Closed
rust-bors Bot pushed a commit that referenced this pull request Jul 30, 2026
@bors
Auto merge of #160213 - JonathanBrouwer:rollup-BhUnoVr, r=JonathanBro…
121a7f3 
…uwer

Rollup of 7 pull requests

Successful merges:

 - #138230 (Add `raw_borrows_via_references` lint)
 - #160031 (std: make positioned I/O unsupported on VxWorks)
 - #159955 (Stop using higher-order macros to declare arenas)
 - #160164 (Derive `GenericTypeVisitable` for `RegionConstraint`)
 - #160177 (A few more "predicate"-to-"clause" renamings)
 - #160192 (Fix ICE for parsing issue with a closing brace)
 - #160209 (bootstrap: Remove method `Subcommand::kind`)
@JonathanBrouwer JonathanBrouwer mentioned this pull request Jul 30, 2026
Merged
rust-bors Bot pushed a commit that referenced this pull request Jul 31, 2026
@bors
Auto merge of #160238 - JonathanBrouwer:rollup-6GZndbU, r=JonathanBro…
15ff78b 
…uwer

Rollup of 25 pull requests

Successful merges:

 - #160204 (Sync from portable simd 2026 07 30)
 - #138230 (Add `raw_borrows_via_references` lint)
 - #158057 (Don't escape U+FF9E and U+FF9F in `escape_debug_ext`)
 - #160015 (refactor(mir-transform): Merge `can_be_overridden`, `is_required` and `is_enabled` into one)
 - #160031 (std: make positioned I/O unsupported on VxWorks)
 - #160125 (Fix typing mode handling in transmute checks and rustc_dump_layout)
 - #160152 (Create on-demand CI job for testing EC2 instances)
 - #160232 (rustdoc: fix ICE when a grapheme cluster joins a Prepend-class character to `_` or `:`)
 - #159214 (std: improve the documentation of the random feature)
 - #159818 (Resolve vars before calling `unnormalized_obligations`)
 - #159955 (Stop using higher-order macros to declare arenas)
 - #159958 (Fix avoid cycle for self referential return type notation)
 - #160040 (Split function parsing out of `item.rs` to a new module.)
 - #160044 (Add regression tests for fixed dead-code issues)
 - #160144 (renovate: group lockfiles PRs)
 - #160149 (Fix Windows on Arm PAC default)
 - #160164 (Derive `GenericTypeVisitable` for `RegionConstraint`)
 - #160175 (Try to recover less from incorrectly parsed const arg)
 - #160177 (A few more "predicate"-to-"clause" renamings)
 - #160181 (Mark `Tuple` and `FnPtr` traits `#[fundamental]`)
 - #160192 (Fix ICE for parsing issue with a closing brace)
 - #160209 (bootstrap: Remove method `Subcommand::kind`)
 - #160221 (Remove `Copy` supertrait from `VaList`)
 - #160223 (interpret: rename validate_operand → validate_place)
 - #160234 (Always use short ty path for call with missing arguments suggestion)
rust-bors Bot pushed a commit that referenced this pull request Jul 31, 2026
@bors
Auto merge of #160238 - JonathanBrouwer:rollup-6GZndbU, r=JonathanBro…
922325b 
…uwer

Rollup of 25 pull requests

Successful merges:

 - #160204 (Sync from portable simd 2026 07 30)
 - #138230 (Add `raw_borrows_via_references` lint)
 - #158057 (Don't escape U+FF9E and U+FF9F in `escape_debug_ext`)
 - #160015 (refactor(mir-transform): Merge `can_be_overridden`, `is_required` and `is_enabled` into one)
 - #160031 (std: make positioned I/O unsupported on VxWorks)
 - #160125 (Fix typing mode handling in transmute checks and rustc_dump_layout)
 - #160152 (Create on-demand CI job for testing EC2 instances)
 - #160232 (rustdoc: fix ICE when a grapheme cluster joins a Prepend-class character to `_` or `:`)
 - #159214 (std: improve the documentation of the random feature)
 - #159818 (Resolve vars before calling `unnormalized_obligations`)
 - #159955 (Stop using higher-order macros to declare arenas)
 - #159958 (Fix avoid cycle for self referential return type notation)
 - #160040 (Split function parsing out of `item.rs` to a new module.)
 - #160044 (Add regression tests for fixed dead-code issues)
 - #160144 (renovate: group lockfiles PRs)
 - #160149 (Fix Windows on Arm PAC default)
 - #160164 (Derive `GenericTypeVisitable` for `RegionConstraint`)
 - #160175 (Try to recover less from incorrectly parsed const arg)
 - #160177 (A few more "predicate"-to-"clause" renamings)
 - #160181 (Mark `Tuple` and `FnPtr` traits `#[fundamental]`)
 - #160192 (Fix ICE for parsing issue with a closing brace)
 - #160209 (bootstrap: Remove method `Subcommand::kind`)
 - #160221 (Remove `Copy` supertrait from `VaList`)
 - #160223 (interpret: rename validate_operand → validate_place)
 - #160234 (Always use short ty path for call with missing arguments suggestion)
@rust-bors
rust-bors Bot merged commit 73766b8 into rust-lang:main Jul 31, 2026
13 checks passed
@rustbot rustbot added this to the 1.99.0 milestone Jul 31, 2026
rust-timer added a commit that referenced this pull request Jul 31, 2026
@rust-timer
Unrolled build for #160177
0348155 
Rollup merge of #160177 - ada4a:push-xmqwrrzvqlny, r=nnethercote

A few more "predicate"-to-"clause" renamings

Follow-up to #159990. This should cover all the files that I didn't get to reviewing in that PR.

r? @nnethercote
cc @oli-obk
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Jul 31, 2026
@bors
Auto merge of #160238 - JonathanBrouwer:rollup-6GZndbU, r=JonathanBro…
3ef529b 
…uwer

Rollup of 25 pull requests

Successful merges:

 - rust-lang/rust#160204 (Sync from portable simd 2026 07 30)
 - rust-lang/rust#138230 (Add `raw_borrows_via_references` lint)
 - rust-lang/rust#158057 (Don't escape U+FF9E and U+FF9F in `escape_debug_ext`)
 - rust-lang/rust#160015 (refactor(mir-transform): Merge `can_be_overridden`, `is_required` and `is_enabled` into one)
 - rust-lang/rust#160031 (std: make positioned I/O unsupported on VxWorks)
 - rust-lang/rust#160125 (Fix typing mode handling in transmute checks and rustc_dump_layout)
 - rust-lang/rust#160152 (Create on-demand CI job for testing EC2 instances)
 - rust-lang/rust#160232 (rustdoc: fix ICE when a grapheme cluster joins a Prepend-class character to `_` or `:`)
 - rust-lang/rust#159214 (std: improve the documentation of the random feature)
 - rust-lang/rust#159818 (Resolve vars before calling `unnormalized_obligations`)
 - rust-lang/rust#159955 (Stop using higher-order macros to declare arenas)
 - rust-lang/rust#159958 (Fix avoid cycle for self referential return type notation)
 - rust-lang/rust#160040 (Split function parsing out of `item.rs` to a new module.)
 - rust-lang/rust#160044 (Add regression tests for fixed dead-code issues)
 - rust-lang/rust#160144 (renovate: group lockfiles PRs)
 - rust-lang/rust#160149 (Fix Windows on Arm PAC default)
 - rust-lang/rust#160164 (Derive `GenericTypeVisitable` for `RegionConstraint`)
 - rust-lang/rust#160175 (Try to recover less from incorrectly parsed const arg)
 - rust-lang/rust#160177 (A few more "predicate"-to-"clause" renamings)
 - rust-lang/rust#160181 (Mark `Tuple` and `FnPtr` traits `#[fundamental]`)
 - rust-lang/rust#160192 (Fix ICE for parsing issue with a closing brace)
 - rust-lang/rust#160209 (bootstrap: Remove method `Subcommand::kind`)
 - rust-lang/rust#160221 (Remove `Copy` supertrait from `VaList`)
 - rust-lang/rust#160223 (interpret: rename validate_operand → validate_place)
 - rust-lang/rust#160234 (Always use short ty path for call with missing arguments suggestion)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nnethercote nnethercote nnethercote approved these changes

Assignees

@nnethercote nnethercote

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-clippy Relevant to the Clippy team. 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.99.0

Development

Successfully merging this pull request may close these issues.

4 participants

@ada4a @rustbot @rust-log-analyzer @nnethercote