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

Diagnostic renaming 2 #121780

Merged
merged 11 commits into from
Mar 5, 2024
Merged

Diagnostic renaming 2 #121780

merged 11 commits into from
Mar 5, 2024

Conversation

nnethercote
Copy link
Contributor

A sequel to #121489.

r? @davidtwco

@rustbot rustbot added 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 29, 2024
@rustbot
Copy link
Collaborator

rustbot commented Feb 29, 2024

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @TaKO8Ki

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

rustc_macros::diagnostics was changed

cc @davidtwco, @compiler-errors, @TaKO8Ki

Some changes occurred in exhaustiveness checking

cc @Nadrieril

rustc_errors::translation was changed

cc @davidtwco, @compiler-errors, @TaKO8Ki

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

The Miri subtree was changed

cc @rust-lang/miri

@bors

This comment was marked as resolved.

Sign in to view
@nnethercote
Copy link
Contributor Author

I rebased.

@bors

This comment was marked as resolved.

Sign in to view
@nnethercote
Copy link
Contributor Author

I rebased again.

@bors

This comment was marked as resolved.

Sign in to view
@nnethercote
Copy link
Contributor Author

I rebased a third time.

@davidtwco
Copy link
Member

@bors r+

Apologies that it took a few days to get to this.

@bors
Copy link
Contributor

bors commented Mar 4, 2024

📌 Commit bbd1242 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 Mar 4, 2024
@nnethercote
Copy link
Contributor Author

@bors p=1

Because this is conflict-prone.

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 4, 2024
@bors
Auto merge of rust-lang#121780 - nnethercote:diag-renaming2, r=davidtwco
a61fb00 
Diagnostic renaming 2

A sequel to rust-lang#121489.

r? `@davidtwco`
@bors
Copy link
Contributor

bors commented Mar 4, 2024

⌛ Testing commit bbd1242 with merge a61fb00...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Mar 4, 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 Mar 4, 2024
@bors
Copy link
Contributor

bors commented Mar 5, 2024

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

@nnethercote
Disable tests/ui-fulldeps/internal-lints/diagnostics.rs on stage 1.
d849f5c 
When you make a change to the diagnostic lints, it uses the old version
of the lints with stage 1 and the new version with stage 2, which often
leads to failures in stage 1. Let's just stick to stage 2.
@nnethercote
Rename DiagnosticMessage as DiagMessage.
18715c9
@nnethercote
Copy link
Contributor Author

I rebased, and added a commit making tests/ui-fulldeps/internal-lints/diagnostics.rs stage 2 only, which it should be, which fixes the test error seen above.

@bors r=davidtwco

@bors
Copy link
Contributor

bors commented Mar 5, 2024

📌 Commit 1cd9574 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 Mar 5, 2024
@bors
Copy link
Contributor

bors commented Mar 5, 2024

⌛ Testing commit 1cd9574 with merge 1547c07...

@bors
Copy link
Contributor

bors commented Mar 5, 2024

☀️ Test successful - checks-actions
Approved by: davidtwco
Pushing 1547c07 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 5, 2024
@bors bors merged commit 1547c07 into rust-lang:master Mar 5, 2024
12 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Mar 5, 2024
This was referenced Mar 5, 2024
Merged
Merged
Merged
Open
@nnethercote nnethercote deleted the diag-renaming2 branch March 5, 2024 05:35
This was referenced Mar 5, 2024
Merged
Open
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1547c07): 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)		 3.9% [2.6%, 8.2%] 8
Regressions ❌
(secondary)		 2.8% [1.7%, 4.3%] 39
Improvements ✅
(primary)		 -0.6% [-0.6%, -0.6%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 3.4% [-0.6%, 8.2%] 9

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)		 2.1% [2.1%, 2.1%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 644.326s -> 645.309s (0.15%)
Artifact size: 174.98 MiB -> 174.97 MiB (-0.01%)

@nnethercote
Copy link
Contributor Author

Presumably the max-rss "regressions" are just noise? This PR just renamed a bunch of stuff, shouldn't have effected performance at all.

@nnethercote nnethercote mentioned this pull request Mar 7, 2024
Merged
flip1995 pushed a commit to flip1995/rust that referenced this pull request Mar 7, 2024
@bors
Auto merge of rust-lang#121780 - nnethercote:diag-renaming2, r=davidtwco
ae710de 
Diagnostic renaming 2

A sequel to rust-lang#121489.

r? `@davidtwco`
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 11, 2024
@bors
Auto merge of rust-lang#122132 - nnethercote:diag-renaming3, r=nnethe…
cd81f5b 
…rcote

Diagnostic renaming 3

A sequel to rust-lang#121780.

r? `@davidtwco`
nnethercote added a commit to nnethercote/rustc-dev-guide that referenced this pull request Mar 11, 2024
@nnethercote
More updates for recent diagnostics changes.
f043b04 
A sequel to rust-lang#1883, this covers diagnostic naming changes from
rust-lang/rust/pull/121489, rust-lang/rust/pull/121780, and
rust-lang/rust/pull/122132.
@nnethercote nnethercote mentioned this pull request Mar 11, 2024
Merged
fmease pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Mar 12, 2024
@nnethercote @fmease
More updates for recent diagnostics changes.
7d6e6c6 
A sequel to #1883, this covers diagnostic naming changes from
rust-lang/rust/pull/121489, rust-lang/rust/pull/121780, and
rust-lang/rust/pull/122132.
GuillaumeGomez pushed a commit to GuillaumeGomez/rustc_codegen_gcc that referenced this pull request Mar 26, 2024
@bors
Auto merge of #122132 - nnethercote:diag-renaming3, r=nnethercote
0031b21 
Diagnostic renaming 3

A sequel to rust-lang/rust#121780.

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

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.78.0
Development

Successfully merging this pull request may close these issues.
6 participants
@nnethercote @rustbot @bors @davidtwco @rust-log-analyzer @rust-timer