Improve handling of numbers in IntoDiagnosticArg
#120398
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @TaKO8Ki (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
Noratrieb
reviewed
Jan 26, 2024
Comment on lines
+71
to
+75
| if let Ok(n) = TryInto::<i128>::try_into(self) && n >= -100 && n <= 100 { | ||
| DiagnosticArgValue::Number(n) | ||
| } else { | ||
| self.to_string().into_diagnostic_arg() | ||
| } |
There was a problem hiding this comment.
Hm, this seems quite confusing. If someone is matching on different numbers, say 0, 1, 100, and 1000, then the latter one will be different, which is pretty inconsistent.
There was a problem hiding this comment.
I think it's a necessary compromise given the usage of f64 in FluentNumber. In reality, you're probably using one of the CLDR numerical selectors, rather than the number directly.
There was a problem hiding this comment.
I agree. I thought of using a more complicated system which would take into account f64 maximum representable base-10 number but I think it's overkill.
The reason I wanted to match on the numbers was to change the sentence in the 1 case, and it will be the case of many other peoples and I think that in many languages phrases with numbers generally only care about 0, 1, >1. So to be safe I choose 100 as a low but consistent and predictable number.
|
I think this is a good step even if it's a bit inconsistent. @bors r+ |
bors
added
S-waiting-on-bors
Nadrieril
added a commit
to Nadrieril/rust
that referenced
this pull request
Jan 27, 2024
…piler-errors Improve handling of numbers in `IntoDiagnosticArg` While working on rust-lang#120393, I realize that my fluent selectors were not working. So here is an improvement (not a fix unfortunately).
Nadrieril
added a commit
to Nadrieril/rust
that referenced
this pull request
Jan 27, 2024
…piler-errors Improve handling of numbers in `IntoDiagnosticArg` While working on rust-lang#120393, I realize that my fluent selectors were not working. So here is an improvement (not a fix unfortunately).
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 27, 2024
Rollup of 9 pull requests Successful merges: - rust-lang#111379 (Boost iterator intersperse(_with) performance) - rust-lang#118182 (Properly recover from trailing attr in body) - rust-lang#119641 (Remove feature not required by `Ipv6Addr::to_cononical` doctest) - rust-lang#119759 (Add FileCheck annotations to dataflow-const-prop tests) - rust-lang#120275 (Avoid ICE in trait without `dyn` lint) - rust-lang#120376 (Update codegen test for LLVM 18) - rust-lang#120386 (ScopeTree: remove destruction_scopes as unused) - rust-lang#120398 (Improve handling of numbers in `IntoDiagnosticArg`) - rust-lang#120399 (Remove myself from review rotation) r? `@ghost` `@rustbot` modify labels: rollup
Nadrieril
added a commit
to Nadrieril/rust
that referenced
this pull request
Jan 27, 2024
…piler-errors Improve handling of numbers in `IntoDiagnosticArg` While working on rust-lang#120393, I realize that my fluent selectors were not working. So here is an improvement (not a fix unfortunately).
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 27, 2024
Rollup of 9 pull requests Successful merges: - rust-lang#111379 (Boost iterator intersperse(_with) performance) - rust-lang#118182 (Properly recover from trailing attr in body) - rust-lang#119641 (Remove feature not required by `Ipv6Addr::to_cononical` doctest) - rust-lang#119957 (fix: correct suggestion arg for impl trait) - rust-lang#120275 (Avoid ICE in trait without `dyn` lint) - rust-lang#120376 (Update codegen test for LLVM 18) - rust-lang#120386 (ScopeTree: remove destruction_scopes as unused) - rust-lang#120398 (Improve handling of numbers in `IntoDiagnosticArg`) - rust-lang#120399 (Remove myself from review rotation) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 27, 2024
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#118182 (Properly recover from trailing attr in body) - rust-lang#119641 (Remove feature not required by `Ipv6Addr::to_cononical` doctest) - rust-lang#119957 (fix: correct suggestion arg for impl trait) - rust-lang#120386 (ScopeTree: remove destruction_scopes as unused) - rust-lang#120398 (Improve handling of numbers in `IntoDiagnosticArg`) - rust-lang#120399 (Remove myself from review rotation) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 27, 2024
Rollup merge of rust-lang#120398 - Urgau:into_diag_arg-numbers, r=compiler-errors Improve handling of numbers in `IntoDiagnosticArg` While working on rust-lang#120393, I realize that my fluent selectors were not working. So here is an improvement (not a fix unfortunately).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While working on #120393, I realize that my fluent selectors were not working. So here is an improvement (not a fix unfortunately).