Many "predicate"-to-"clause" renamings by nnethercote · Pull Request #159990 · rust-lang/rust

nnethercote · 2026-07-27T04:37:51Z

Lots of names weren't changed to account for the introduction of the Clause type as a specialized form of Predicate, presumably because it was tedious. This commit converts as many of them as I could find. It's mostly very tedious renamings of types, functions, variables, and queries. The more interesting ones are a couple of files (predicates_of.rs, impossible_predicates.rs) and a MIR pass (ImpossiblePredicates).

r? @oli-obk

rustbot · 2026-07-27T04:37:54Z

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

cc @BoxyUwU, @tshepang

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

changes to the core type system

cc @lcnr

This PR changes rustc_public

cc @oli-obk, @celinval, @ouz-a, @makai410

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

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

cc @rust-lang/clippy

Some changes occurred in const_evaluatable.rs

cc @BoxyUwU

nnethercote · 2026-07-27T04:39:10Z

Apologies for the large diff. I did this a while ago but wasn't sure if it was worth the churn. Then @spastorino mentioned #107250 to me and I saw the unchecked item "Rename identifiers like pred and predicates to clause if they're actually clauses around the codebase" (which is exactly what this does) and decided to file the PR.

ada4a

I believe I've found some instances of the comments/code surrounding your changes which should be updated to mention clauses as well. Not an expert in this by any stretch of imagination though, so please double-check 👉👈

View changes since this review

ada4a

another batch

View changes since this review

ada4a

last batch for today...

View changes since this review

ada4a · 2026-07-27T11:51:48Z

-                match predicate.kind().skip_binder() {
+            for &(clause, span) in gen_clauses.clauses {
+                match clause.kind().skip_binder() {
                    ty::ClauseKind::TypeOutlives(OutlivesPredicate(ty, reg)) => {


possibly off-topic: since OutlivesPredicate seems to actually be a kind of Clause, should it be renamed to OutlivesClause maybe? With that, maybe RequiredPredicates could be renamed as well.

I guess OutlivesPredicate being in rustc_public would make all of this a bit more annoying..

Maybe, but I'll put it in the too-hard basket for now.

Would it make sense to leave TODOs for this?

Lots of names weren't changed to account for the introduction of the `Clause` type as a specialized form of `Predicate`, presumably because it was tedious. This commit converts as many of them as I could find. It's mostly very tedious renamings of types, functions, variables, and queries. The more interesting ones are a couple of files (`predicates_of.rs`, `impossible_predicates.rs`) and a MIR pass (`ImpossiblePredicates`).

rustbot · 2026-07-28T01:48:59Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

nnethercote · 2026-07-28T01:49:23Z

@ada4a: thank you for the extremely thorough review! I have made all your suggested changes except where noted above.

oli-obk · 2026-07-28T08:57:35Z

nominating for awareness during today's types meeting.

oli-obk

@bors r+ p=1 reason=bitrotty

View changes since this review

rust-bors · 2026-07-28T14:30:25Z

📌 Commit ff161b1 has been approved by oli-obk

It is now in the queue for this repository.

@oli-obk

…=oli-obk Many "predicate"-to-"clause" renamings Lots of names weren't changed to account for the introduction of the `Clause` type as a specialized form of `Predicate`, presumably because it was tedious. This commit converts as many of them as I could find. It's mostly very tedious renamings of types, functions, variables, and queries. The more interesting ones are a couple of files (`predicates_of.rs`, `impossible_predicates.rs`) and a MIR pass (`ImpossiblePredicates`). r? @oli-obk

@oli-obk

…=oli-obk Many "predicate"-to-"clause" renamings Lots of names weren't changed to account for the introduction of the `Clause` type as a specialized form of `Predicate`, presumably because it was tedious. This commit converts as many of them as I could find. It's mostly very tedious renamings of types, functions, variables, and queries. The more interesting ones are a couple of files (`predicates_of.rs`, `impossible_predicates.rs`) and a MIR pass (`ImpossiblePredicates`). r? @oli-obk

@oli-obk

…=oli-obk Many "predicate"-to-"clause" renamings Lots of names weren't changed to account for the introduction of the `Clause` type as a specialized form of `Predicate`, presumably because it was tedious. This commit converts as many of them as I could find. It's mostly very tedious renamings of types, functions, variables, and queries. The more interesting ones are a couple of files (`predicates_of.rs`, `impossible_predicates.rs`) and a MIR pass (`ImpossiblePredicates`). r? @oli-obk

…uwer Rollup of 14 pull requests Successful merges: - #159990 (Many "predicate"-to-"clause" renamings) - #159665 (Replace most `Ty::new_fn_def` calls with `type_of` queries directly) - #159687 (rustdoc: Set tracing max_level_info when debug-logging is false) - #160065 (Distinguish the dep-graph index space from the live node count) - #159978 (run intrinsic-test by default on x86_64-gnu) - #160008 (Avoid stale closure recovery state across statements) - #160027 (Add regression test for #132767) - #160030 (Update `browser-ui-test` version to `0.25.0`) - #160046 (Improve consistency of attribute error messages (part 2)) - #160056 (Fix associated function suggestion for generic ADTs) - #160069 (Update Rust crate tracing-subscriber to v0.3.23 [SECURITY]) - #160071 (sanitize_standard_fds: clarify macos comment) - #160076 (use unstable features when updating dependencies) - #160088 (fix 404 url in src/doc/rustdoc.md)

@oli-obk

…=oli-obk Many "predicate"-to-"clause" renamings Lots of names weren't changed to account for the introduction of the `Clause` type as a specialized form of `Predicate`, presumably because it was tedious. This commit converts as many of them as I could find. It's mostly very tedious renamings of types, functions, variables, and queries. The more interesting ones are a couple of files (`predicates_of.rs`, `impossible_predicates.rs`) and a MIR pass (`ImpossiblePredicates`). r? @oli-obk

…uwer Rollup of 21 pull requests Successful merges: - #159990 (Many "predicate"-to-"clause" renamings) - #159665 (Replace most `Ty::new_fn_def` calls with `type_of` queries directly) - #159687 (rustdoc: Set tracing max_level_info when debug-logging is false) - #160057 (refactor(mir-transform): Calculate optimization status inside `run_passes_inner`) - #160060 (codegen: skip stores for entirely-uninit constant aggregate fields, attempt #2) - #160063 (Fix ICE when dumping the dep graph with the parallel frontend) - #160065 (Distinguish the dep-graph index space from the live node count) - #158038 (Split register_tool into register_attribute_tool and register_lint_tool) - #159776 (remove const hack in alloc) - #159978 (run intrinsic-test by default on x86_64-gnu) - #160008 (Avoid stale closure recovery state across statements) - #160027 (Add regression test for #132767) - #160030 (Update `browser-ui-test` version to `0.25.0`) - #160046 (Improve consistency of attribute error messages (part 2)) - #160056 (Fix associated function suggestion for generic ADTs) - #160069 (Update Rust crate tracing-subscriber to v0.3.23 [SECURITY]) - #160071 (sanitize_standard_fds: clarify macos comment) - #160076 (use unstable features when updating dependencies) - #160092 (miri ui tests: don't run native tests on stage 0) - #160093 (Switch cargo assignments to weihanglo) - #160094 (Update assignment for docs)

@oli-obk

Rollup merge of #159990 - nnethercote:predicate-to-clause, r=oli-obk Many "predicate"-to-"clause" renamings Lots of names weren't changed to account for the introduction of the `Clause` type as a specialized form of `Predicate`, presumably because it was tedious. This commit converts as many of them as I could find. It's mostly very tedious renamings of types, functions, variables, and queries. The more interesting ones are a couple of files (`predicates_of.rs`, `impossible_predicates.rs`) and a MIR pass (`ImpossiblePredicates`). r? @oli-obk

…uwer Rollup of 21 pull requests Successful merges: - rust-lang/rust#159990 (Many "predicate"-to-"clause" renamings) - rust-lang/rust#159665 (Replace most `Ty::new_fn_def` calls with `type_of` queries directly) - rust-lang/rust#159687 (rustdoc: Set tracing max_level_info when debug-logging is false) - rust-lang/rust#160057 (refactor(mir-transform): Calculate optimization status inside `run_passes_inner`) - rust-lang/rust#160060 (codegen: skip stores for entirely-uninit constant aggregate fields, attempt rust-lang/rust#2) - rust-lang/rust#160063 (Fix ICE when dumping the dep graph with the parallel frontend) - rust-lang/rust#160065 (Distinguish the dep-graph index space from the live node count) - rust-lang/rust#158038 (Split register_tool into register_attribute_tool and register_lint_tool) - rust-lang/rust#159776 (remove const hack in alloc) - rust-lang/rust#159978 (run intrinsic-test by default on x86_64-gnu) - rust-lang/rust#160008 (Avoid stale closure recovery state across statements) - rust-lang/rust#160027 (Add regression test for rust-lang/rust#132767) - rust-lang/rust#160030 (Update `browser-ui-test` version to `0.25.0`) - rust-lang/rust#160046 (Improve consistency of attribute error messages (part 2)) - rust-lang/rust#160056 (Fix associated function suggestion for generic ADTs) - rust-lang/rust#160069 (Update Rust crate tracing-subscriber to v0.3.23 [SECURITY]) - rust-lang/rust#160071 (sanitize_standard_fds: clarify macos comment) - rust-lang/rust#160076 (use unstable features when updating dependencies) - rust-lang/rust#160092 (miri ui tests: don't run native tests on stage 0) - rust-lang/rust#160093 (Switch cargo assignments to weihanglo) - rust-lang/rust#160094 (Update assignment for docs)

rustbot assigned oli-obk Jul 27, 2026

nnethercote mentioned this pull request Jul 27, 2026

Separate clauses and goals from the Predicate type #107250

Open

10 tasks

ada4a reviewed Jul 27, 2026

View reviewed changes

Comment thread compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs Outdated

ada4a reviewed Jul 27, 2026

View reviewed changes

nnethercote force-pushed the predicate-to-clause branch from 13031e6 to 1a3be39 Compare July 27, 2026 08:51

ada4a reviewed Jul 27, 2026

View reviewed changes

Comment thread compiler/rustc_hir_analysis/src/collect/clauses_of.rs

nnethercote force-pushed the predicate-to-clause branch from 1a3be39 to aa61b88 Compare July 27, 2026 09:39

ada4a reviewed Jul 27, 2026

View reviewed changes

nnethercote force-pushed the predicate-to-clause branch from aa61b88 to ff161b1 Compare July 28, 2026 01:48

oli-obk added the I-types-nominated Nominated for discussion during a types team meeting. label Jul 28, 2026

oli-obk approved these changes Jul 28, 2026

View reviewed changes

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 28, 2026

oli-obk removed the I-types-nominated Nominated for discussion during a types team meeting. label Jul 28, 2026

JonathanBrouwer mentioned this pull request Jul 28, 2026

Rollup of 12 pull requests #160081

Closed

JonathanBrouwer mentioned this pull request Jul 28, 2026

Rollup of 11 pull requests #160082

Closed

JonathanBrouwer mentioned this pull request Jul 28, 2026

Rollup of 14 pull requests #160089

Closed

This was referenced Jul 28, 2026

Rollup of 14 pull requests #160096

Closed

Rollup of 21 pull requests #160102

Merged

rust-bors Bot merged commit 0a1a25a into rust-lang:main Jul 28, 2026
13 checks passed

rustbot added this to the 1.99.0 milestone Jul 28, 2026

nnethercote deleted the predicate-to-clause branch July 29, 2026 02:44

Uh oh!

Uh oh!

Conversation

nnethercote commented Jul 27, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jul 27, 2026

Uh oh!

nnethercote commented Jul 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

ada4a left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ada4a left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ada4a left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ada4a Jul 27, 2026

Choose a reason for hiding this comment

Uh oh!

nnethercote Jul 28, 2026

Choose a reason for hiding this comment

Uh oh!

ada4a Jul 28, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rustbot commented Jul 28, 2026

Uh oh!

nnethercote commented Jul 28, 2026

Uh oh!

oli-obk commented Jul 28, 2026

Uh oh!

oli-obk left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rust-bors Bot commented Jul 28, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

nnethercote commented Jul 27, 2026 •

edited by rustbot

Loading

nnethercote commented Jul 27, 2026 •

edited

Loading

ada4a left a comment •

edited by rustbot

Loading

ada4a left a comment •

edited by rustbot

Loading

ada4a left a comment •

edited by rustbot

Loading

oli-obk left a comment •

edited by rustbot

Loading