Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Uplift Goal to rustc_type_ir #125150

Merged
merged 6 commits into from
May 17, 2024
Merged

Uplift Goal to rustc_type_ir #125150

merged 6 commits into from
May 17, 2024
+328 −298

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented May 15, 2024 •
edited
Loading

r? lcnr

This also renames ToPredicate to Uplift, which is conceptually a helper trait for Into-like operations for things that need a TyCtxt. This name is based off of the same named trait from a-mir-formality.

@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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels May 15, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 15, 2024

changes to the core type system

cc @compiler-errors, @lcnr

HIR ty lowering was modified

cc @fmease

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.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented May 15, 2024

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@compiler-errors
Copy link
Member Author

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 15, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request May 15, 2024
@bors
Auto merge of rust-lang#125150 - compiler-errors:uplift-goal, r=<try>
Loading
Loading status checks…
60f9e86 
Uplift `Goal` to `rustc_type_ir`

r? lcnr

This also renames `ToPredicate` to `Uplift`, which is conceptually a helper trait for `Into`-like operations for things that need a `TyCtxt`.
@bors
Copy link
Contributor

bors commented May 15, 2024

⌛ Trying commit f6e0a6a with merge 60f9e86...

lcnr
lcnr reviewed May 15, 2024
View reviewed changes
src/tools/clippy/clippy_utils/src/ty.rs Outdated
@@ -311,7 +311,7 @@ pub fn implements_trait_with_env_from_iter<'tcx>(
cause: ObligationCause::dummy(),
param_env,
recursion_depth: 0,
predicate: Binder::dummy(trait_ref).to_predicate(tcx),
predicate: Binder::dummy(trait_ref).upcast(tcx),
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
predicate: Binder::dummy(trait_ref).upcast(tcx),
predicate: trait_ref.upcast(tcx),

lcnr
lcnr reviewed May 15, 2024
View reviewed changes
Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

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

army after perf

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented May 15, 2024

💔 Test failed - checks-actions

@bors bors 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 May 15, 2024
@compiler-errors
Copy link
Member Author

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented May 15, 2024

⌛ Trying commit 7cf4aca with merge cac9ff5...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 15, 2024
@bors
Auto merge of rust-lang#125150 - compiler-errors:uplift-goal, r=<try>
Loading
Loading status checks…
cac9ff5 
Uplift `Goal` to `rustc_type_ir`

r? lcnr

This also renames `ToPredicate` to `Uplift`, which is conceptually a helper trait for `Into`-like operations for things that need a `TyCtxt`. This name is based off of the same named trait from a-mir-formality.
@bors
Copy link
Contributor

bors commented May 15, 2024

☀️ Try build successful - checks-actions
Build commit: cac9ff5 (cac9ff5350d22fa8f30c24451ded236598cb6e69)

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (cac9ff5): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 678.357s -> 681.282s (0.43%)
Artifact size: 316.14 MiB -> 316.14 MiB (0.00%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label May 16, 2024
@bors
Copy link
Contributor

bors commented May 16, 2024

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

@lcnr
Copy link
Contributor

lcnr commented May 16, 2024

r=me after ci

@compiler-errors
Copy link
Member Author

@bors r=lcnr

@bors
Copy link
Contributor

bors commented May 16, 2024

📌 Commit 7b3d6da has been approved by lcnr

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 May 16, 2024
@bors
Copy link
Contributor

bors commented May 16, 2024

⌛ Testing commit 7b3d6da with merge 70d978b...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 16, 2024
@bors
Auto merge of rust-lang#125150 - compiler-errors:uplift-goal, r=lcnr
Loading
Loading status checks…
70d978b 
Uplift `Goal` to `rustc_type_ir`

r? lcnr

This also renames `ToPredicate` to `Uplift`, which is conceptually a helper trait for `Into`-like operations for things that need a `TyCtxt`. This name is based off of the same named trait from a-mir-formality.
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Contributor

bors commented May 16, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 16, 2024
@compiler-errors
Copy link
Member Author

@bors retry

@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 May 16, 2024
@bors
Copy link
Contributor

bors commented May 17, 2024

⌛ Testing commit 7b3d6da with merge fa37db5...

@bors
Copy link
Contributor

bors commented May 17, 2024

☀️ Test successful - checks-actions
Approved by: lcnr
Pushing fa37db5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 17, 2024
@bors bors merged commit fa37db5 into rust-lang:master May 17, 2024
7 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 17, 2024
This was referenced May 17, 2024
Merged
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (fa37db5): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 678.725s -> 678.599s (-0.02%)
Artifact size: 316.04 MiB -> 316.13 MiB (0.03%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcnr lcnr

Assignees

@lcnr lcnr

Labels
merged-by-bors This PR was explicitly merged by bors. 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@compiler-errors @rustbot @rust-log-analyzer @rust-timer @bors @lcnr