Skip to content

Remove constness from TraitPredicate - #114202

Merged
bors merged 1 commit into
rust-lang:masterfrom
fee1-dead-contrib:rm-constness-2
Aug 2, 2023
Merged

Remove constness from TraitPredicate#114202
bors merged 1 commit into
rust-lang:masterfrom
fee1-dead-contrib:rm-constness-2

Conversation

@fee1-dead

Copy link
Copy Markdown
Member

Any ICEs or compiler errors created by this PR are expected and intended to be fixed in the future.

r? @oli-obk
cc #110395

@rustbotrustbot 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jul 29, 2023
@rustbot

Copy link
Copy Markdown
Collaborator

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to the core trait solver

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

Some changes occurred in engine.rs, potentially modifying the public API of ObligationCtxt.

cc @lcnr, @compiler-errors

@rust-log-analyzer

This comment has been minimized.

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.

should we just remove the code instead of leaving it commented out? Can always recover it from history

@oli-obkoli-obk left a comment

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.

probably needs to wait until the pretty printing PR lands?

@fee1-dead

Copy link
Copy Markdown
MemberAuthor

probably needs to wait until the pretty printing PR lands?

I mean I think this is orthogonal to #114203? Git should know to perform a three-way merge and since these PRs don't modify the same places on the same file it should be fine

@fee1-dead

Copy link
Copy Markdown
MemberAuthor

@oli-obk is this good to go now?

@oli-obk

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jul 31, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 39e556bb635256eb8eb2952913447c9f7b60a026 has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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 31, 2023
@bors

bors commented Aug 1, 2023

Copy link
Copy Markdown
Collaborator

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

@borsbors 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 Aug 1, 2023
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@oli-obk

Copy link
Copy Markdown
Contributor

r=me after CI golf succeeds and commits are squashed

@fee1-dead

Copy link
Copy Markdown
MemberAuthor

@bors r=oli-obk

@bors

bors commented Aug 1, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 44793d008f2a5af80666092abf20c358f137f836 has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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 Aug 1, 2023
@bors

bors commented Aug 2, 2023

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout rm-constness-2(switch to your branch)
  2. git fetch upstream master(retrieve the latest master)
  3. git rebase upstream/master -p(rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self rm-constness-2 --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Removing tests/ui/rfcs/rfc-2632-const-trait-impl/specialization/const-default-bound-non-const-specialized-bound.stderr
Auto-merging compiler/rustc_ty_utils/src/ty.rs
CONFLICT (content): Merge conflict in compiler/rustc_ty_utils/src/ty.rs
Auto-merging compiler/rustc_trait_selection/src/traits/select/mod.rs
Auto-merging compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
Auto-merging compiler/rustc_middle/src/ty/structural_impls.rs
Auto-merging compiler/rustc_hir_analysis/src/check/wfcheck.rs
Auto-merging compiler/rustc_hir_analysis/src/astconv/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

@borsbors 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 Aug 2, 2023
@bors

bors commented Aug 2, 2023

Copy link
Copy Markdown
Collaborator

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

@fee1-dead

Copy link
Copy Markdown
MemberAuthor

Rebased.

@bors p=1 r=oli-obk

Bitrotty

@bors

bors commented Aug 2, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 4fec845 has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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 Aug 2, 2023
@bors

bors commented Aug 2, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 4fec845 with merge 20747af...

@bors

bors commented Aug 2, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 20747af to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 2, 2023
@bors
bors merged commit 20747af into rust-lang:masterAug 2, 2023
@rustbotrustbot added this to the 1.73.0 milestone Aug 2, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (20747af): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-0.7%[-0.9%, -0.4%]16
Improvements ✅
(secondary)
-0.6%[-1.2%, -0.3%]13
All ❌✅ (primary)-0.7%[-0.9%, -0.4%]16

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
2.2%[2.2%, 2.2%]1
Improvements ✅
(primary)
-2.4%[-3.3%, -1.5%]2
Improvements ✅
(secondary)
-2.2%[-3.4%, -0.9%]2
All ❌✅ (primary)-2.4%[-3.3%, -1.5%]2

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-2.4%[-2.4%, -2.4%]1
Improvements ✅
(secondary)
--0
All ❌✅ (primary)-2.4%[-2.4%, -2.4%]1

Binary size

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-0.0%[-0.1%, -0.0%]16
Improvements ✅
(secondary)
-0.1%[-0.2%, -0.0%]21
All ❌✅ (primary)-0.0%[-0.1%, -0.0%]16

Bootstrap: 649.933s -> 650.695s (0.12%)

@lcnrlcnr removed the WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) label Aug 4, 2023
@fee1-deadfee1-dead mentioned this pull request Dec 12, 2023
@fee1-dead
fee1-dead deleted the rm-constness-2 branch September 21, 2024 16:07
@fee1-deadfee1-dead added the F-const_trait_impl `#![feature(const_trait_impl)]` label Jul 13, 2025
@fmeasefmease added the PG-const-traits Project group: Const traits label Nov 24, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

F-const_trait_impl`#![feature(const_trait_impl)]`merged-by-borsThis PR was explicitly merged by bors.PG-const-traitsProject group: Const traitsS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@fee1-dead@rustbot@rust-log-analyzer@oli-obk@bors@rust-timer@fmease@lcnr