bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

typeck: remove now-unnecessary parameter from diag

Browse source 
Removes `expected_pluralize` parameter from diagnostic struct which is
no longer necessary as the Fluent message can determine the correct
pluralization.

Signed-off-by: David Wood <david.wood@huawei.com>
This commit is contained in:
David Wood 2022-04-02 06:18:48 +01:00
parent 141f8404a8
commit c6a3349bd7
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_typeck/src/check/intrinsic.rs
View file

@ -7,7 +7,7 @@ use crate::errors::{
}; };
use crate::require_same_types; use crate::require_same_types;
use rustc_errors::{pluralize, struct_span_err}; use rustc_errors::struct_span_err;
use rustc_hir as hir; use rustc_hir as hir;
use rustc_middle::traits::{ObligationCause, ObligationCauseCode}; use rustc_middle::traits::{ObligationCause, ObligationCauseCode};
use rustc_middle::ty::subst::Subst; use rustc_middle::ty::subst::Subst;
@ -43,7 +43,6 @@ fn equate_intrinsic_type<'tcx>(
span, span,
found, found,
expected, expected,
expected_pluralize: pluralize!(expected),
descr, descr,
}); });
false false

1
compiler/rustc_typeck/src/errors.rs
View file

@ -30,7 +30,6 @@ pub struct WrongNumberOfGenericArgumentsToIntrinsic<'a> {
pub span: Span, pub span: Span,
pub found: usize, pub found: usize,
pub expected: usize, pub expected: usize,
pub expected_pluralize: &'a str,
pub descr: &'a str, pub descr: &'a str,
} }