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

Flatten diagnostic slug modules #103345

Merged
merged 3 commits into from
Oct 23, 2022
Merged

Flatten diagnostic slug modules #103345

merged 3 commits into from
Oct 23, 2022

Conversation

Noratrieb
Copy link
Member

This makes it easier to grep for the slugs in the code.

See https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/Localization.20infra.20interferes.20with.20grepping.20for.20error for more discussion about it.

This was mostly done with a few regexes and a bunch of manual work. This also exposes a pretty annoying inconsistency for the extra labels. Some of the extra labels are defined as additional properties in the fluent message (which makes them not prefixed with the crate name) and some of them are new fluent messages themselves (which makes them prefixed with the crate name). I don't know whether we want to clean this up at some point but it's useful to know.

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 T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 21, 2022
@rustbot
Copy link
Collaborator

rustbot commented Oct 21, 2022

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo

rustc_macros::diagnostics was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 21, 2022
@Noratrieb Noratrieb mentioned this pull request Oct 21, 2022
Merged
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Noratrieb Noratrieb mentioned this pull request Oct 21, 2022
Merged
@bors
Copy link
Contributor

bors commented Oct 21, 2022

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

@Noratrieb Noratrieb force-pushed the diag-flat branch 3 times, most recently from d077875 to 6703872 Compare October 22, 2022 09:08
@bors
Copy link
Contributor

bors commented Oct 22, 2022

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

@compiler-errors
Copy link
Member

@bors r+ rollup=never p=2 bitrotty

@bors
Copy link
Contributor

bors commented Oct 22, 2022

📌 Commit 20897c6f83ad86de0e006b34de5a00a459b12f94 has been approved by compiler-errors

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 Oct 22, 2022
@bors
Copy link
Contributor

bors commented Oct 22, 2022

⌛ Testing commit 20897c6f83ad86de0e006b34de5a00a459b12f94 with merge 7fd8ed5467e188686e19738bcdecae24304d6981...

@bors
Copy link
Contributor

bors commented Oct 23, 2022

💥 Test timed out

@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 Oct 23, 2022
@compiler-errors
Copy link
Member

@bors delegate+

r=me after rebasing

@bors
Copy link
Contributor

bors commented Oct 23, 2022

✌️ @Nilstrieb can now approve this pull request

@rust-log-analyzer

This comment has been minimized.

Sign in to view
This was referenced Oct 23, 2022
Merged
Merged
Merged
Merged
Merged
Merged
Closed
Closed
Merged
Closed
@bors bors mentioned this pull request Oct 23, 2022
Merged
This was referenced Oct 23, 2022
Closed
Closed
Closed
Merged
Closed
Merged
Merged
Merged
Closed
Merged
This was referenced Oct 23, 2022
Closed
Merged
@rust-timer
Copy link
Collaborator

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

mean1 range count2
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 6.3% [5.8%, 6.7%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Cycles

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

Footnotes

  1. the arithmetic mean of the percent change ↩

  2. number of relevant changes ↩

davidtwco pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Oct 25, 2022
@Noratrieb @davidtwco
Update diagnostics to flat fluent message paths
6686b1e 
As implemented in rust-lang/rust#103345
rajputrajat added a commit to rajputrajat/rust that referenced this pull request Nov 13, 2022
@rajputrajat
migrating rustc_resolve to SessionDiagnostic. work in progress. start
269ce36 
implement binding_shadows

migrate till self-in-generic-param-default

use braces in fluent message as suggested by @compiler-errors.

to fix lock file issue reported by CI

migrate 'unreachable label' error

run formatter

name the variables correctly in fluent file

SessionDiagnostic -> Diagnostic

test "pattern/pat-tuple-field-count-cross.rs" passed

test "resolve/bad-env-capture2.rs" passed

test "enum/enum-in-scope.rs" and other depended on "resolve_binding_shadows_something_unacceptable" should be passed now.

fix crash errors while running test-suite. there might be more.

then_some(..) suits better here.

all tests passed

convert TraitImpl and InvalidAsm. TraitImpl is buggy yet. will fix after receiving help from Zulip

migrate "Ralative-2018"

migrate "ancestor only"

migrate "expected found"

migrate "Indeterminate"

migrate "module only"

revert to the older implementation for now. since this is failing at the moment.

follow the convension for fluent variable

order the diag attribute as suggested in review comment

fix merge error. migrate trait-impl-duplicate

make the changes compatible with "Flatten diagnostic slug modules rust-lang#103345"

fix merge

remove commented code

merge issues

fix review comments

fix tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@davidtwco davidtwco

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. 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
Milestone
1.66.0
Development

Successfully merging this pull request may close these issues.
8 participants
@Noratrieb @rustbot @rust-log-analyzer @bors @compiler-errors @rust-timer @davidtwco @rust-highfive