Skip to content

EvaluatedToUnknown -> EvaluatedToAmbigStackDependent, EvaluatedToRecur -> EvaluatedToErrStackDependent #118685

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.

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

Merged
merged 1 commit into from
Dec 7, 2023

Conversation

compiler-errors
Copy link
Member

Less confusing names, since the only difference between them and their parallel EvalutedTo.. is that they are stack dependent.

r? lcnr

@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. labels Dec 6, 2023
Comment on lines +183 to +184
/// implies `EvaluatedToAmbig` implies `EvaluatedToAmbigStackDependent`
/// - `EvaluatedToErr` implies `EvaluatedToErrStackDependent`
Copy link
Member Author

Choose a reason for hiding this comment

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

This doesn't seem to agree with the ordering, unless I am misunderstanding what "implies" means in both the positive and negative case.

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah, it seems wrong.

Though unifying EvaluatedToAmbigStackDependent and EvaluatedToAmbig should result in EvaluatedToAmbigStackDependent 🤔 at least when unifying the result of multiple nested goals

I believe the comment to be right and the order here to be wrong 🤔

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes I thought so too.

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.

r=me idk how we should deal with this comment

Comment on lines +183 to +184
/// implies `EvaluatedToAmbig` implies `EvaluatedToAmbigStackDependent`
/// - `EvaluatedToErr` implies `EvaluatedToErrStackDependent`
Copy link
Contributor

Choose a reason for hiding this comment

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

yeah, it seems wrong.

Though unifying EvaluatedToAmbigStackDependent and EvaluatedToAmbig should result in EvaluatedToAmbigStackDependent 🤔 at least when unifying the result of multiple nested goals

I believe the comment to be right and the order here to be wrong 🤔

@compiler-errors
Copy link
Member Author

@bors r=lcnr

gonna just leave the comment :>

@bors
Copy link
Collaborator

bors commented Dec 6, 2023

📌 Commit d732c3b has been approved by lcnr

It is now in the queue for this repository.

@compiler-errors
Copy link
Member Author

@bors rollup

@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 Dec 6, 2023
@bors
Copy link
Collaborator

bors commented Dec 7, 2023

⌛ Testing commit d732c3b with merge f90f898...

@bors
Copy link
Collaborator

bors commented Dec 7, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 7, 2023
@bors bors merged commit f90f898 into rust-lang:master Dec 7, 2023
@rustbot rustbot added this to the 1.76.0 milestone Dec 7, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (f90f898): 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)

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.

mean range count
Regressions ❌
(primary)
2.1% [0.5%, 5.1%] 3
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.5% [-1.5%, -1.5%] 2
Improvements ✅
(secondary)
-2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) 0.6% [-1.5%, 5.1%] 5

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.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.6% [-0.6%, -0.6%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.6% [-0.6%, -0.6%] 1

Binary size

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

Bootstrap: 675.831s -> 675.32s (-0.08%)
Artifact size: 314.22 MiB -> 314.18 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants