nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-09 08:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pluralize 'parenthesis' correctly

Browse Source 
It's 'parentheses', not 'parenthesis', when you have more than one.
This commit is contained in:
Camelid 2020-12-18 19:56:14 -08:00
parent f3d9df54ee
commit a5e8e6ec2d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_typeck/src/check/pat.rs
View File

@ -1002,7 +1002,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
// More generally, the expected type wants a tuple variant with one field of an // More generally, the expected type wants a tuple variant with one field of an
// N-arity-tuple, e.g., `V_i((p_0, .., p_N))`. Meanwhile, the user supplied a pattern // N-arity-tuple, e.g., `V_i((p_0, .., p_N))`. Meanwhile, the user supplied a pattern
// with the subpatterns directly in the tuple variant pattern, e.g., `V_i(p_0, .., p_N)`. // with the subpatterns directly in the tuple variant pattern, e.g., `V_i(p_0, .., p_N)`.
let missing_parenthesis = match (&expected.kind(), fields, had_err) { let missing_parentheses = match (&expected.kind(), fields, had_err) {
// #67037: only do this if we could successfully type-check the expected type against // #67037: only do this if we could successfully type-check the expected type against
// the tuple struct pattern. Otherwise the substs could get out of range on e.g., // the tuple struct pattern. Otherwise the substs could get out of range on e.g.,
// `let P() = U;` where `P != U` with `struct P<T>(T);`. // `let P() = U;` where `P != U` with `struct P<T>(T);`.
@ -1015,13 +1015,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
} }
_ => false, _ => false,
}; };
if missing_parenthesis { if missing_parentheses {
let (left, right) = match subpats { let (left, right) = match subpats {
// This is the zero case; we aim to get the "hi" part of the `QPath`'s // This is the zero case; we aim to get the "hi" part of the `QPath`'s
// span as the "lo" and then the "hi" part of the pattern's span as the "hi". // span as the "lo" and then the "hi" part of the pattern's span as the "hi".
// This looks like: // This looks like:
// //
// help: missing parenthesis // help: missing parentheses
// | // |
// L | let A(()) = A(()); // L | let A(()) = A(());
// | ^ ^ // | ^ ^
@ -1030,14 +1030,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
// last sub-pattern. In the case of `A(x)` the first and last may coincide. // last sub-pattern. In the case of `A(x)` the first and last may coincide.
// This looks like: // This looks like:
// //
// help: missing parenthesis // help: missing parentheses
// | // |
// L | let A((x, y)) = A((1, 2)); // L | let A((x, y)) = A((1, 2));
// | ^ ^ // | ^ ^
[first, ..] => (first.span.shrink_to_lo(), subpats.last().unwrap().span), [first, ..] => (first.span.shrink_to_lo(), subpats.last().unwrap().span),
}; };
err.multipart_suggestion( err.multipart_suggestion(
"missing parenthesis", "missing parentheses",
vec![(left, "(".to_string()), (right.shrink_to_hi(), ")".to_string())], vec![(left, "(".to_string()), (right.shrink_to_hi(), ")".to_string())],
Applicability::MachineApplicable, Applicability::MachineApplicable,
); );

4
src/test/ui/error-codes/E0023.stderr
View File

@ -43,7 +43,7 @@ LL | Orange((String, String)),
LL | Fruit::Orange(a, b) => {}, LL | Fruit::Orange(a, b) => {},
| ^^^^^^^^^^^^^^^^^^^ expected 1 field, found 2 | ^^^^^^^^^^^^^^^^^^^ expected 1 field, found 2
| |
help: missing parenthesis help: missing parentheses
| |
LL | Fruit::Orange((a, b)) => {}, LL | Fruit::Orange((a, b)) => {},
| ^ ^ | ^ ^
@ -57,7 +57,7 @@ LL | Banana(()),
LL | Fruit::Banana() => {}, LL | Fruit::Banana() => {},
| ^^^^^^^^^^^^^^^ expected 1 field, found 0 | ^^^^^^^^^^^^^^^ expected 1 field, found 0
| |
help: missing parenthesis help: missing parentheses
| |
LL | Fruit::Banana(()) => {}, LL | Fruit::Banana(()) => {},
| ^ ^ | ^ ^