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

Diagnostic renaming #121489

Merged
merged 10 commits into from
Feb 28, 2024
Merged

Diagnostic renaming #121489

merged 10 commits into from
Feb 28, 2024

Conversation

nnethercote
Copy link
Contributor

Renaming various diagnostic types from Diagnostic* to Diag*. Part of rust-lang/compiler-team#722. There are more to do but this is enough for one PR.

r? @davidtwco

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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. labels Feb 23, 2024
@rustbot
Copy link
Collaborator

rustbot commented Feb 23, 2024

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

Some changes occurred in match checking

cc @Nadrieril

rustc_macros::diagnostics was changed

cc @davidtwco, @compiler-errors, @TaKO8Ki

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

Some changes occurred in need_type_info.rs

cc @lcnr

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

rustc_errors::translation was changed

cc @davidtwco, @compiler-errors, @TaKO8Ki

Some changes occurred in exhaustiveness checking

cc @Nadrieril

@bors

This comment was marked as resolved.

@nnethercote
Copy link
Contributor Author

I rebased.

@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Feb 27, 2024

📌 Commit c20c548 has been approved by davidtwco

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 Feb 27, 2024
@bors
Copy link
Contributor

bors commented Feb 27, 2024

🔒 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 diag-renaming (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 diag-renaming --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
Auto-merging compiler/rustc_resolve/src/diagnostics.rs
Auto-merging compiler/rustc_passes/src/check_attr.rs
Auto-merging compiler/rustc_parse/src/parser/stmt.rs
Auto-merging compiler/rustc_parse/src/parser/expr.rs
Auto-merging compiler/rustc_parse/src/parser/diagnostics.rs
Auto-merging compiler/rustc_middle/src/ty/layout.rs
Auto-merging compiler/rustc_infer/src/infer/error_reporting/nice_region_error/mod.rs
Auto-merging compiler/rustc_infer/src/infer/error_reporting/mod.rs
Auto-merging compiler/rustc_hir_typeck/src/coercion.rs
Auto-merging compiler/rustc_hir_analysis/src/collect.rs
Auto-merging compiler/rustc_hir_analysis/src/check/mod.rs
Auto-merging compiler/rustc_hir_analysis/src/check/check.rs
Auto-merging compiler/rustc_borrowck/src/diagnostics/region_errors.rs
CONFLICT (content): Merge conflict in compiler/rustc_borrowck/src/diagnostics/region_errors.rs
Automatic merge failed; fix conflicts and then commit the result.

@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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 27, 2024
@bors
Copy link
Contributor

bors commented Feb 27, 2024

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

I started by changing it to `DiagData`, but that didn't feel right.
`DiagInner` felt much better.
Note the change of the `D` to `d`, to match all the other names that
have `Subdiag` in them, such as `SubdiagnosticMessage` and
`derive(Subdiagnostic)`.
Much better!

Note that this involves renaming (and updating the value of)
`DIAGNOSTIC_BUILDER` in clippy.
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (c475e23): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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)
1.2% [1.2%, 1.2%] 1
Improvements ✅
(primary)
-0.9% [-0.9%, -0.8%] 4
Improvements ✅
(secondary)
-0.5% [-0.8%, -0.4%] 9
All ❌✅ (primary) -0.9% [-0.9%, -0.8%] 4

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)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.7% [-2.7%, -2.7%] 1
Improvements ✅
(secondary)
-2.8% [-4.3%, -1.7%] 3
All ❌✅ (primary) -2.7% [-2.7%, -2.7%] 1

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)
3.0% [1.5%, 5.9%] 14
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 651.872s -> 652.986s (0.17%)
Artifact size: 311.14 MiB -> 311.09 MiB (-0.02%)

@rustbot rustbot added the perf-regression Performance regression. label Feb 29, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 4, 2024
adpaco-aws added a commit to model-checking/kani that referenced this pull request Mar 4, 2024
Upgrades the Rust toolchain to `nightly-2024-03-01`. The Rust compiler
PRs that triggered changes in this upgrades are:
 * rust-lang/rust#121516
 * rust-lang/rust#121598
 * rust-lang/rust#121489
 * rust-lang/rust#121783
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 5, 2024
@Mark-Simulacrum
Copy link
Member

Regression is essentially guaranteed to be bimodality, not a real change. Marking as triaged.

@Mark-Simulacrum Mark-Simulacrum added the perf-regression-triaged The performance regression has been triaged. label Mar 5, 2024
flip1995 pushed a commit to flip1995/rust that referenced this pull request Mar 7, 2024
Diagnostic renaming

Renaming various diagnostic types from `Diagnostic*` to `Diag*`. Part of rust-lang/compiler-team#722. There are more to do but this is enough for one PR.

r? `@davidtwco`
flip1995 pushed a commit to flip1995/rust that referenced this pull request Mar 7, 2024
nnethercote added a commit to nnethercote/rustc-dev-guide that referenced this pull request Mar 11, 2024
fmease pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Mar 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. 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. T-rustdoc Relevant 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.

6 participants