Skip to content

Conversation

compiler-errors
Copy link
Member

  1. Use ty_error_with_guaranteed more so we don't delay so many span bugs
  2. Rename ty_error_with_guaranteed to ty_error, ty_error to ty_error_misc. This is to incentivize using the former over the latter in cases where we already are witness to a ErrorGuaranteed token.

Second commit is just name replacement, so the first commit can be reviewed on its own with more scrutiny.

@rustbot
Copy link
Collaborator

rustbot commented Feb 22, 2023

r? @jackh726

(rustbot has picked a reviewer for you, use r? to override)

@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 Feb 22, 2023
@rustbot
Copy link
Collaborator

rustbot commented Feb 22, 2023

Some changes occurred to the core trait solver

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

@BoxyUwU
Copy link
Member

BoxyUwU commented Feb 23, 2023

r? @BoxyUwU

@bors r+ p=1 rollup=never because this seems like it might get very merge conflicted since any PR that touches ty_error or ty_error_with_guaranteed is gonna 💥 👀

@bors
Copy link
Collaborator

bors commented Feb 23, 2023

📌 Commit 298ae8c has been approved by BoxyUwU

It is now in the queue for this repository.

@rustbot rustbot assigned BoxyUwU and unassigned jackh726 Feb 23, 2023
@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 Feb 23, 2023
@bors
Copy link
Collaborator

bors commented Feb 23, 2023

⌛ Testing commit 298ae8c with merge 07c993e...

@bors
Copy link
Collaborator

bors commented Feb 23, 2023

☀️ Test successful - checks-actions
Approved by: BoxyUwU
Pushing 07c993e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 23, 2023
@bors bors merged commit 07c993e into rust-lang:master Feb 23, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 23, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (07c993e): 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.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.1% [-1.2%, -1.0%] 2
Improvements ✅
(secondary)
-2.2% [-2.5%, -2.0%] 6
All ❌✅ (primary) -1.1% [-1.2%, -1.0%] 2

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.

@compiler-errors compiler-errors deleted the ty-error-more branch February 23, 2023 16:50
@lcnr lcnr removed the WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) label Mar 6, 2023
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.

7 participants