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.

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

A couple datalog/borrowck cleanups #134914

Merged
merged 7 commits into from
Dec 30, 2024
Merged

Conversation

lqd
Copy link
Member

@lqd lqd commented Dec 30, 2024

As discussed on zulip, here's a chill one in between slightly more interesting PRs:

  • I hadn't noticed there still were a couple of datalog-related modules outside of their dedicated polonius module (go to horn-clause jail, bonk!).
  • there somehow was both a diags module and a diagnostics module.
  • a couple other tiny things being renamed -- let me know what you think.

As requested I've tried to have somewhat granular commits to ease review, but the last two or three could be squashed together, since they're all related to the diags module (but moving its contents is less tedious to check in its own commit).

r? @jackh726

lqd added 7 commits December 30, 2024 06:51
- remove unneeded type ascription
- fix variable name
- fix typo in comment
- fix `var_origins` var and function name: these are `VarInfos`
this is specific to the old datalog implementation and wasn't noticed in
the previous module move
this is mostly to remove imports of the polonius legacy module

also what is going on in this function, what the...
this is specific to the old datalog implementation and wasn't noticed in
the previous module move
it's a more natural place for diagnostics-related structures and
functions
- rename it to what it does, buffer diagnostics
- remove single-use functions
- use derives
@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 30, 2024
@jackh726
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 30, 2024

📌 Commit 099b809 has been approved by jackh726

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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 30, 2024
@bors
Copy link
Contributor

bors commented Dec 30, 2024

⌛ Testing commit 099b809 with merge 2061630...

@bors
Copy link
Contributor

bors commented Dec 30, 2024

☀️ Test successful - checks-actions
Approved by: jackh726
Pushing 2061630 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 30, 2024
@bors bors merged commit 2061630 into rust-lang:master Dec 30, 2024
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 30, 2024
@lqd lqd deleted the polonius-next-episode-5 branch December 30, 2024 21:22
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (2061630): 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 (primary 2.4%, secondary 3.0%)

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.4% [1.3%, 3.9%] 11
Regressions ❌
(secondary)
3.0% [3.0%, 3.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.4% [1.3%, 3.9%] 11

Cycles

Results (secondary -2.7%)

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
Improvements ✅
(secondary)
-2.7% [-3.3%, -2.3%] 3
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 759.393s -> 759.925s (0.07%)
Artifact size: 325.55 MiB -> 325.47 MiB (-0.03%)

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