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

Fix fluent diagnostics #129477

Merged
merged 2 commits into from
Sep 17, 2024
Merged

Fix fluent diagnostics #129477

merged 2 commits into from
Sep 17, 2024

Conversation

Xiretza
Copy link
Contributor

@Xiretza Xiretza commented Aug 23, 2024

This line number calculation was both wrong and unnecessary.

@rustbot
Copy link
Collaborator

rustbot commented Aug 23, 2024

r? @BoxyUwU

rustbot has assigned @BoxyUwU.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 Aug 23, 2024
@BoxyUwU
Copy link
Member

BoxyUwU commented Sep 16, 2024

r? @compiler-errors

@rustbot rustbot assigned compiler-errors and unassigned BoxyUwU Sep 16, 2024
let message = annotate_snippets::Level::Error.title(&err).snippet(
Snippet::source(this.source())
.line_start(line_start)
.line_start(1)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 1?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the 1-indexed line number that the snippet starts on. Since 1 is the default anyway, I'll just remove it.

@Xiretza Xiretza force-pushed the fix-fluent-diagnostics branch from d4168f5 to 5b3bde9 Compare September 17, 2024 14:49
@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 17, 2024

📌 Commit 5b3bde9 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 Sep 17, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 17, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#129477 (Fix fluent diagnostics)
 - rust-lang#129674 (Add new_cyclic_in for Rc and Arc)
 - rust-lang#130452 (Update Trusty target maintainers)
 - rust-lang#130467 (Miri subtree update)
 - rust-lang#130477 (Revert rust-lang#129749 to fix segfault in LLVM)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8b36ecb into rust-lang:master Sep 17, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 17, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 17, 2024
Rollup merge of rust-lang#129477 - Xiretza:fix-fluent-diagnostics, r=compiler-errors

Fix fluent diagnostics

This line number calculation was both wrong and unnecessary.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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