Skip to content

Commit ad550b8

Browse files
euclioeuclio
committed
use American spelling for pluralize! 
1 parent 1423bec commit ad550b8

File tree

21 files changed

+57
-57
lines changed

21 files changed

+57
-57
lines changed

‎src/librustc/lint/builtin.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use crate::lint::{LintPass, LateLintPass, LintArray, FutureIncompatibleInfo};
88
use crate::middle::stability;
99
use crate::session::Session;
10-
use errors::{Applicability, DiagnosticBuilder, pluralise};
10+
use errors::{Applicability, DiagnosticBuilder, pluralize};
1111
use syntax::ast;
1212
use syntax::edition::Edition;
1313
use syntax::source_map::Span;
@@ -651,7 +651,7 @@ pub(crate) fn add_elided_lifetime_in_path_suggestion(
651651
};
652652
db.span_suggestion(
653653
replace_span,
654-
&format!("indicate the anonymous lifetime{}", pluralise!(n)),
654+
&format!("indicate the anonymous lifetime{}", pluralize!(n)),
655655
suggestion,
656656
Applicability::MachineApplicable
657657
);

‎src/librustc/middle/resolve_lifetime.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use crate::ty::{self, DefIdTree, GenericParamDefKind, TyCtxt};
1717
use crate::rustc::lint;
1818
use crate::session::Session;
1919
use crate::util::nodemap::{DefIdMap, FxHashMap, FxHashSet, HirIdMap, HirIdSet};
20-
use errors::{Applicability, DiagnosticBuilder, pluralise};
20+
use errors::{Applicability, DiagnosticBuilder, pluralize};
2121
use rustc_macros::HashStable;
2222
use std::borrow::Cow;
2323
use std::cell::Cell;
@@ -3044,7 +3044,7 @@ pub fn report_missing_lifetime_specifiers(
30443044
span,
30453045
E0106,
30463046
"missing lifetime specifier{}",
3047-
pluralise!(count)
3047+
pluralize!(count)
30483048
)
30493049
}
30503050

‎src/librustc/traits/error_reporting.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use crate::ty::subst::Subst;
3333
use crate::ty::SubtypePredicate;
3434
use crate::util::nodemap::{FxHashMap, FxHashSet};
3535

36-
use errors::{Applicability, DiagnosticBuilder, pluralise};
36+
use errors::{Applicability, DiagnosticBuilder, pluralize};
3737
use std::fmt;
3838
use syntax::ast;
3939
use syntax::symbol::{sym, kw};
@@ -1553,7 +1553,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
15531553
_ => format!("{} {}argument{}",
15541554
arg_length,
15551555
if distinct && arg_length > 1 { "distinct " } else { "" },
1556-
pluralise!(arg_length))
1556+
pluralize!(arg_length))
15571557
}
15581558
};
15591559

‎src/librustc/ty/error.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::borrow::Cow;
44
use std::fmt;
55
use rustc_target::spec::abi;
66
use syntax::ast;
7-
use syntax::errors::pluralise;
7+
use syntax::errors::pluralize;
88
use errors::{Applicability, DiagnosticBuilder};
99
use syntax_pos::Span;
1010

@@ -100,17 +100,17 @@ impl<'tcx> fmt::Display for TypeError<'tcx> {
100100
write!(f, "expected a tuple with {} element{}, \
101101
found one with {} element{}",
102102
values.expected,
103-
pluralise!(values.expected),
103+
pluralize!(values.expected),
104104
values.found,
105-
pluralise!(values.found))
105+
pluralize!(values.found))
106106
}
107107
FixedArraySize(values) => {
108108
write!(f, "expected an array with a fixed size of {} element{}, \
109109
found one with {} element{}",
110110
values.expected,
111-
pluralise!(values.expected),
111+
pluralize!(values.expected),
112112
values.found,
113-
pluralise!(values.found))
113+
pluralize!(values.found))
114114
}
115115
ArgCount => {
116116
write!(f, "incorrect number of function parameters")
@@ -165,7 +165,7 @@ impl<'tcx> fmt::Display for TypeError<'tcx> {
165165
ProjectionBoundsLength(ref values) => {
166166
write!(f, "expected {} associated type binding{}, found {}",
167167
values.expected,
168-
pluralise!(values.expected),
168+
pluralize!(values.expected),
169169
values.found)
170170
},
171171
ExistentialMismatch(ref values) => {
@@ -196,7 +196,7 @@ impl<'tcx> ty::TyS<'tcx> {
196196
let n = tcx.lift(&n).unwrap();
197197
match n.try_eval_usize(tcx, ty::ParamEnv::empty()) {
198198
Some(n) => {
199-
format!("array of {} element{}", n, pluralise!(n)).into()
199+
format!("array of {} element{}", n, pluralize!(n)).into()
200200
}
201201
None => "array".into(),
202202
}

‎src/librustc_errors/emitter.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use Destination::*;
1212
use syntax_pos::{SourceFile, Span, MultiSpan};
1313

1414
use crate::{
15-
Level, CodeSuggestion, Diagnostic, SubDiagnostic, pluralise,
15+
Level, CodeSuggestion, Diagnostic, SubDiagnostic, pluralize,
1616
SuggestionStyle, SourceMapper, SourceMapperDyn, DiagnosticId,
1717
};
1818
use crate::Level::Error;
@@ -1573,7 +1573,7 @@ impl EmitterWriter {
15731573
}
15741574
if suggestions.len() > MAX_SUGGESTIONS {
15751575
let others = suggestions.len() - MAX_SUGGESTIONS;
1576-
let msg = format!("and {} other candidate{}", others, pluralise!(others));
1576+
let msg = format!("and {} other candidate{}", others, pluralize!(others));
15771577
buffer.puts(row_num, max_line_num_len + 3, &msg, Style::NoStyle);
15781578
} else if notice_capitalization {
15791579
let msg = "notice the capitalization difference";

‎src/librustc_errors/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@ impl Level {
10271027
}
10281028

10291029
#[macro_export]
1030-
macro_rules! pluralise {
1030+
macro_rules! pluralize {
10311031
($x:expr) => {
10321032
if $x != 1 { "s" } else { "" }
10331033
};

‎src/librustc_lint/unused.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use lint::{LintPass, EarlyLintPass, LateLintPass};
1010

1111
use syntax::ast;
1212
use syntax::attr;
13-
use syntax::errors::{Applicability, pluralise};
13+
use syntax::errors::{Applicability, pluralize};
1414
use syntax::feature_gate::{AttributeType, BuiltinAttribute, BUILTIN_ATTRIBUTE_MAP};
1515
use syntax::print::pprust;
1616
use syntax::symbol::{kw, sym};
@@ -144,7 +144,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnusedResults {
144144
return true;
145145
}
146146

147-
let plural_suffix = pluralise!(plural_len);
147+
let plural_suffix = pluralize!(plural_len);
148148

149149
match ty.kind {
150150
ty::Adt(..) if ty.is_box() => {

‎src/librustc_mir/hair/pattern/check_match.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ fn joined_uncovered_patterns(witnesses: &[super::Pat<'_>]) -> String {
548548
}
549549

550550
fn pattern_not_covered_label(witnesses: &[super::Pat<'_>], joined_patterns: &str) -> String {
551-
format!("pattern{} {} not covered", rustc_errors::pluralise!(witnesses.len()), joined_patterns)
551+
format!("pattern{} {} not covered", rustc_errors::pluralize!(witnesses.len()), joined_patterns)
552552
}
553553

554554
/// Point at the definition of non-covered `enum` variants.

‎src/librustc_resolve/check_unused.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
use crate::Resolver;
2727
use crate::resolve_imports::ImportDirectiveSubclass;
2828

29-
use errors::pluralise;
29+
use errors::pluralize;
3030

3131
use rustc::util::nodemap::NodeMap;
3232
use rustc::{lint, ty};
@@ -297,7 +297,7 @@ impl Resolver<'_> {
297297
}).collect::<Vec<String>>();
298298
span_snippets.sort();
299299
let msg = format!("unused import{}{}",
300-
pluralise!(len),
300+
pluralize!(len),
301301
if !span_snippets.is_empty() {
302302
format!(": {}", span_snippets.join(", "))
303303
} else {

‎src/librustc_resolve/resolve_imports.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use crate::{Resolver, ResolutionError, BindingKey, Segment, ModuleKind};
1111
use crate::{names_to_string, module_to_string};
1212
use crate::diagnostics::Suggestion;
1313

14-
use errors::{Applicability, pluralise};
14+
use errors::{Applicability, pluralize};
1515

1616
use rustc_data_structures::ptr_key::PtrKey;
1717
use rustc::ty;
@@ -730,7 +730,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
730730

731731
let msg = format!(
732732
"unresolved import{} {}",
733-
pluralise!(paths.len()),
733+
pluralize!(paths.len()),
734734
paths.join(", "),
735735
);
736736

‎src/librustc_typeck/astconv.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use rustc_target::spec::abi;
2323
use crate::require_c_abi_if_c_variadic;
2424
use smallvec::SmallVec;
2525
use syntax::ast;
26-
use syntax::errors::pluralise;
26+
use syntax::errors::pluralize;
2727
use syntax::feature_gate::{GateIssue, emit_feature_err};
2828
use syntax::util::lev_distance::find_best_match_for_name;
2929
use syntax::symbol::sym;
@@ -392,7 +392,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
392392
quantifier,
393393
bound,
394394
kind,
395-
pluralise!(bound),
395+
pluralize!(bound),
396396
))
397397
};
398398

@@ -1360,7 +1360,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
13601360
span,
13611361
E0191,
13621362
"the value of the associated type{} {} must be specified",
1363-
pluralise!(associated_types.len()),
1363+
pluralize!(associated_types.len()),
13641364
names,
13651365
);
13661366
let (suggest, potential_assoc_types_spans) =

‎src/librustc_typeck/check/compare_method.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc::util::common::ErrorReported;
1010
use errors::{Applicability, DiagnosticId};
1111

1212
use syntax_pos::Span;
13-
use syntax::errors::pluralise;
13+
use syntax::errors::pluralize;
1414

1515
use super::{Inherited, FnCtxt, potentially_plural_count};
1616

@@ -649,9 +649,9 @@ fn compare_number_of_generics<'tcx>(
649649
declaration has {} {kind} parameter{}",
650650
trait_.ident,
651651
impl_count,
652-
pluralise!(impl_count),
652+
pluralize!(impl_count),
653653
trait_count,
654-
pluralise!(trait_count),
654+
pluralize!(trait_count),
655655
kind = kind,
656656
),
657657
DiagnosticId::Error("E0049".into()),
@@ -666,7 +666,7 @@ fn compare_number_of_generics<'tcx>(
666666
"expected {} {} parameter{}",
667667
trait_count,
668668
kind,
669-
pluralise!(trait_count),
669+
pluralize!(trait_count),
670670
));
671671
}
672672
for span in spans {
@@ -681,7 +681,7 @@ fn compare_number_of_generics<'tcx>(
681681
"found {} {} parameter{}{}",
682682
impl_count,
683683
kind,
684-
pluralise!(impl_count),
684+
pluralize!(impl_count),
685685
suffix.unwrap_or_else(|| String::new()),
686686
));
687687
}

‎src/librustc_typeck/check/expr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use crate::util::common::ErrorReported;
1717
use crate::util::nodemap::FxHashMap;
1818
use crate::astconv::AstConv as _;
1919

20-
use errors::{Applicability, DiagnosticBuilder, pluralise};
20+
use errors::{Applicability, DiagnosticBuilder, pluralize};
2121
use syntax_pos::hygiene::DesugaringKind;
2222
use syntax::ast;
2323
use syntax::symbol::{Symbol, kw, sym};
@@ -1210,7 +1210,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
12101210

12111211
struct_span_err!(tcx.sess, span, E0063,
12121212
"missing field{} {}{} in initializer of `{}`",
1213-
pluralise!(remaining_fields.len()),
1213+
pluralize!(remaining_fields.len()),
12141214
remaining_fields_names,
12151215
truncated_fields_error,
12161216
adt_ty)

‎src/librustc_typeck/check/method/suggest.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::check::FnCtxt;
55
use crate::middle::lang_items::FnOnceTraitLangItem;
66
use crate::namespace::Namespace;
77
use crate::util::nodemap::FxHashSet;
8-
use errors::{Applicability, DiagnosticBuilder, pluralise};
8+
use errors::{Applicability, DiagnosticBuilder, pluralize};
99
use rustc::hir::{self, ExprKind, Node, QPath};
1010
use rustc::hir::def::{Res, DefKind};
1111
use rustc::hir::def_id::{CRATE_DEF_INDEX, LOCAL_CRATE, DefId};
@@ -601,7 +601,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
601601
"{an}other candidate{s} {were} found in the following trait{s}, perhaps \
602602
add a `use` for {one_of_them}:",
603603
an = if candidates.len() == 1 {"an" } else { "" },
604-
s = pluralise!(candidates.len()),
604+
s = pluralize!(candidates.len()),
605605
were = if candidates.len() == 1 { "was" } else { "were" },
606606
one_of_them = if candidates.len() == 1 {
607607
"it"

‎src/librustc_typeck/check/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ pub mod intrinsic;
8888
mod op;
8989

9090
use crate::astconv::{AstConv, PathSeg};
91-
use errors::{Applicability, DiagnosticBuilder, DiagnosticId, pluralise};
91+
use errors::{Applicability, DiagnosticBuilder, DiagnosticId, pluralize};
9292
use rustc::hir::{self, ExprKind, GenericArg, ItemKind, Node, PatKind, QPath};
9393
use rustc::hir::def::{CtorOf, Res, DefKind};
9494
use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
@@ -5167,5 +5167,5 @@ fn fatally_break_rust(sess: &Session) {
51675167
}
51685168

51695169
fn potentially_plural_count(count: usize, word: &str) -> String {
5170-
format!("{} {}{}", count, word, pluralise!(count))
5170+
format!("{} {}{}", count, word, pluralize!(count))
51715171
}

‎src/librustc_typeck/check/pat.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::check::FnCtxt;
22
use crate::util::nodemap::FxHashMap;
3-
use errors::{Applicability, DiagnosticBuilder, pluralise};
3+
use errors::{Applicability, DiagnosticBuilder, pluralize};
44
use rustc::hir::{self, PatKind, Pat, HirId};
55
use rustc::hir::def::{Res, DefKind, CtorKind};
66
use rustc::hir::pat_util::EnumerateAndAdjustIterator;
@@ -703,8 +703,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
703703
fields: &[ty::FieldDef],
704704
expected: Ty<'tcx>
705705
) {
706-
let subpats_ending = pluralise!(subpats.len());
707-
let fields_ending = pluralise!(fields.len());
706+
let subpats_ending = pluralize!(subpats.len());
707+
let fields_ending = pluralize!(fields.len());
708708
let res_span = self.tcx.def_span(res.def_id());
709709
let mut err = struct_span_err!(
710710
self.tcx.sess,
@@ -1174,10 +1174,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
11741174
E0527,
11751175
"pattern requires {} element{} but array has {}",
11761176
min_len,
1177-
pluralise!(min_len),
1177+
pluralize!(min_len),
11781178
size,
11791179
)
1180-
.span_label(span, format!("expected {} element{}", size, pluralise!(size)))
1180+
.span_label(span, format!("expected {} element{}", size, pluralize!(size)))
11811181
.emit();
11821182
}
11831183

@@ -1188,14 +1188,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
11881188
E0528,
11891189
"pattern requires at least {} element{} but array has {}",
11901190
min_len,
1191-
pluralise!(min_len),
1191+
pluralize!(min_len),
11921192
size,
11931193
).span_label(
11941194
span,
11951195
format!(
11961196
"pattern cannot match array of {} element{}",
11971197
size,
1198-
pluralise!(size),
1198+
pluralize!(size),
11991199
),
12001200
).emit();
12011201
}

‎src/libsyntax/parse/parser/diagnostics.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use crate::ptr::P;
1212
use crate::symbol::{kw, sym};
1313
use crate::ThinVec;
1414
use crate::util::parser::AssocOp;
15-
use errors::{Applicability, DiagnosticBuilder, DiagnosticId, pluralise};
15+
use errors::{Applicability, DiagnosticBuilder, DiagnosticId, pluralize};
1616
use rustc_data_structures::fx::FxHashSet;
1717
use syntax_pos::{Span, DUMMY_SP, MultiSpan, SpanSnippetError};
1818
use log::{debug, trace};
@@ -515,11 +515,11 @@ impl<'a> Parser<'a> {
515515
self.diagnostic()
516516
.struct_span_err(
517517
span,
518-
&format!("unmatched angle bracket{}", pluralise!(total_num_of_gt)),
518+
&format!("unmatched angle bracket{}", pluralize!(total_num_of_gt)),
519519
)
520520
.span_suggestion(
521521
span,
522-
&format!("remove extra angle bracket{}", pluralise!(total_num_of_gt)),
522+
&format!("remove extra angle bracket{}", pluralize!(total_num_of_gt)),
523523
String::new(),
524524
Applicability::MachineApplicable,
525525
)

0 commit comments

Comments
 (0)