Skip to content

Commit efb613e

Browse files
compiler-errorscompiler-errors
authored
Rollup merge of rust-lang#110153 - DaniPopes:compiler-typos, r=Nilstrieb
Fix typos in compiler I ran [`typos -w compiler`](https://github.com/crate-ci/typos) to fix typos in the `compiler` directory. Refs rust-lang#110150
2 parents a78a9dd + 40f12c6 commit efb613e

File tree

70 files changed

+138
-136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+138
-136
lines changed

Diff for: ‎compiler/rustc_ast/src/format.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ impl FormatArguments {
9494
}
9595
if !matches!(arg.kind, FormatArgumentKind::Captured(..)) {
9696
// This is an explicit argument.
97-
// Make sure that all arguments so far are explcit.
97+
// Make sure that all arguments so far are explicit.
9898
assert_eq!(
9999
self.num_explicit_args,
100100
self.arguments.len(),

Diff for: ‎compiler/rustc_ast_lowering/src/errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ pub struct AsyncNonMoveClosureNotSupported {
137137

138138
#[derive(Diagnostic, Clone, Copy)]
139139
#[diag(ast_lowering_functional_record_update_destructuring_assignment)]
140-
pub struct FunctionalRecordUpdateDestructuringAssignemnt {
140+
pub struct FunctionalRecordUpdateDestructuringAssignment {
141141
#[primary_span]
142142
#[suggestion(code = "", applicability = "machine-applicable")]
143143
pub span: Span,

Diff for: ‎compiler/rustc_ast_lowering/src/expr.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::errors::{
22
AsyncGeneratorsNotSupported, AsyncNonMoveClosureNotSupported, AwaitOnlyInAsyncFnAndBlocks,
3-
BaseExpressionDoubleDot, ClosureCannotBeStatic, FunctionalRecordUpdateDestructuringAssignemnt,
3+
BaseExpressionDoubleDot, ClosureCannotBeStatic, FunctionalRecordUpdateDestructuringAssignment,
44
GeneratorTooManyParameters, InclusiveRangeWithNoEnd, NotSupportedForLifetimeBinderAsyncClosure,
55
UnderscoreExprLhsAssign,
66
};
@@ -434,7 +434,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
434434
// `if let pat = val` or `if foo && let pat = val`, as we _do_ want `val` to live beyond the
435435
// condition in this case.
436436
//
437-
// In order to mantain the drop behavior for the non `let` parts of the condition,
437+
// In order to maintain the drop behavior for the non `let` parts of the condition,
438438
// we still wrap them in terminating scopes, e.g. `if foo && let pat = val` essentially
439439
// gets transformed into `if { let _t = foo; _t } && let pat = val`
440440
match &cond.kind {
@@ -1232,7 +1232,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
12321232
);
12331233
let fields_omitted = match &se.rest {
12341234
StructRest::Base(e) => {
1235-
self.tcx.sess.emit_err(FunctionalRecordUpdateDestructuringAssignemnt {
1235+
self.tcx.sess.emit_err(FunctionalRecordUpdateDestructuringAssignment {
12361236
span: e.span,
12371237
});
12381238
true

Diff for: ‎compiler/rustc_borrowck/src/constraints/graph.rs

+17-15
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use crate::{
1313
/// The construct graph organizes the constraints by their end-points.
1414
/// It can be used to view a `R1: R2` constraint as either an edge `R1
1515
/// -> R2` or `R2 -> R1` depending on the direction type `D`.
16-
pub(crate) struct ConstraintGraph<D: ConstraintGraphDirecton> {
16+
pub(crate) struct ConstraintGraph<D: ConstraintGraphDirection> {
1717
_direction: D,
1818
first_constraints: IndexVec<RegionVid, Option<OutlivesConstraintIndex>>,
1919
next_constraints: IndexVec<OutlivesConstraintIndex, Option<OutlivesConstraintIndex>>,
@@ -25,7 +25,7 @@ pub(crate) type ReverseConstraintGraph = ConstraintGraph<Reverse>;
2525

2626
/// Marker trait that controls whether a `R1: R2` constraint
2727
/// represents an edge `R1 -> R2` or `R2 -> R1`.
28-
pub(crate) trait ConstraintGraphDirecton: Copy + 'static {
28+
pub(crate) trait ConstraintGraphDirection: Copy + 'static {
2929
fn start_region(c: &OutlivesConstraint<'_>) -> RegionVid;
3030
fn end_region(c: &OutlivesConstraint<'_>) -> RegionVid;
3131
fn is_normal() -> bool;
@@ -38,7 +38,7 @@ pub(crate) trait ConstraintGraphDirecton: Copy + 'static {
3838
#[derive(Copy, Clone, Debug)]
3939
pub(crate) struct Normal;
4040

41-
impl ConstraintGraphDirecton for Normal {
41+
impl ConstraintGraphDirection for Normal {
4242
fn start_region(c: &OutlivesConstraint<'_>) -> RegionVid {
4343
c.sup
4444
}
@@ -59,7 +59,7 @@ impl ConstraintGraphDirecton for Normal {
5959
#[derive(Copy, Clone, Debug)]
6060
pub(crate) struct Reverse;
6161

62-
impl ConstraintGraphDirecton for Reverse {
62+
impl ConstraintGraphDirection for Reverse {
6363
fn start_region(c: &OutlivesConstraint<'_>) -> RegionVid {
6464
c.sub
6565
}
@@ -73,7 +73,7 @@ impl ConstraintGraphDirecton for Reverse {
7373
}
7474
}
7575

76-
impl<D: ConstraintGraphDirecton> ConstraintGraph<D> {
76+
impl<D: ConstraintGraphDirection> ConstraintGraph<D> {
7777
/// Creates a "dependency graph" where each region constraint `R1:
7878
/// R2` is treated as an edge `R1 -> R2`. We use this graph to
7979
/// construct SCCs for region inference but also for error
@@ -133,15 +133,15 @@ impl<D: ConstraintGraphDirecton> ConstraintGraph<D> {
133133
}
134134
}
135135

136-
pub(crate) struct Edges<'s, 'tcx, D: ConstraintGraphDirecton> {
136+
pub(crate) struct Edges<'s, 'tcx, D: ConstraintGraphDirection> {
137137
graph: &'s ConstraintGraph<D>,
138138
constraints: &'s OutlivesConstraintSet<'tcx>,
139139
pointer: Option<OutlivesConstraintIndex>,
140140
next_static_idx: Option<usize>,
141141
static_region: RegionVid,
142142
}
143143

144-
impl<'s, 'tcx, D: ConstraintGraphDirecton> Iterator for Edges<'s, 'tcx, D> {
144+
impl<'s, 'tcx, D: ConstraintGraphDirection> Iterator for Edges<'s, 'tcx, D> {
145145
type Item = OutlivesConstraint<'tcx>;
146146

147147
fn next(&mut self) -> Option<Self::Item> {
@@ -174,13 +174,13 @@ impl<'s, 'tcx, D: ConstraintGraphDirecton> Iterator for Edges<'s, 'tcx, D> {
174174
/// This struct brings together a constraint set and a (normal, not
175175
/// reverse) constraint graph. It implements the graph traits and is
176176
/// usd for doing the SCC computation.
177-
pub(crate) struct RegionGraph<'s, 'tcx, D: ConstraintGraphDirecton> {
177+
pub(crate) struct RegionGraph<'s, 'tcx, D: ConstraintGraphDirection> {
178178
set: &'s OutlivesConstraintSet<'tcx>,
179179
constraint_graph: &'s ConstraintGraph<D>,
180180
static_region: RegionVid,
181181
}
182182

183-
impl<'s, 'tcx, D: ConstraintGraphDirecton> RegionGraph<'s, 'tcx, D> {
183+
impl<'s, 'tcx, D: ConstraintGraphDirection> RegionGraph<'s, 'tcx, D> {
184184
/// Creates a "dependency graph" where each region constraint `R1:
185185
/// R2` is treated as an edge `R1 -> R2`. We use this graph to
186186
/// construct SCCs for region inference but also for error
@@ -202,35 +202,37 @@ impl<'s, 'tcx, D: ConstraintGraphDirecton> RegionGraph<'s, 'tcx, D> {
202202
}
203203
}
204204

205-
pub(crate) struct Successors<'s, 'tcx, D: ConstraintGraphDirecton> {
205+
pub(crate) struct Successors<'s, 'tcx, D: ConstraintGraphDirection> {
206206
edges: Edges<'s, 'tcx, D>,
207207
}
208208

209-
impl<'s, 'tcx, D: ConstraintGraphDirecton> Iterator for Successors<'s, 'tcx, D> {
209+
impl<'s, 'tcx, D: ConstraintGraphDirection> Iterator for Successors<'s, 'tcx, D> {
210210
type Item = RegionVid;
211211

212212
fn next(&mut self) -> Option<Self::Item> {
213213
self.edges.next().map(|c| D::end_region(&c))
214214
}
215215
}
216216

217-
impl<'s, 'tcx, D: ConstraintGraphDirecton> graph::DirectedGraph for RegionGraph<'s, 'tcx, D> {
217+
impl<'s, 'tcx, D: ConstraintGraphDirection> graph::DirectedGraph for RegionGraph<'s, 'tcx, D> {
218218
type Node = RegionVid;
219219
}
220220

221-
impl<'s, 'tcx, D: ConstraintGraphDirecton> graph::WithNumNodes for RegionGraph<'s, 'tcx, D> {
221+
impl<'s, 'tcx, D: ConstraintGraphDirection> graph::WithNumNodes for RegionGraph<'s, 'tcx, D> {
222222
fn num_nodes(&self) -> usize {
223223
self.constraint_graph.first_constraints.len()
224224
}
225225
}
226226

227-
impl<'s, 'tcx, D: ConstraintGraphDirecton> graph::WithSuccessors for RegionGraph<'s, 'tcx, D> {
227+
impl<'s, 'tcx, D: ConstraintGraphDirection> graph::WithSuccessors for RegionGraph<'s, 'tcx, D> {
228228
fn successors(&self, node: Self::Node) -> <Self as graph::GraphSuccessors<'_>>::Iter {
229229
self.outgoing_regions(node)
230230
}
231231
}
232232

233-
impl<'s, 'tcx, D: ConstraintGraphDirecton> graph::GraphSuccessors<'_> for RegionGraph<'s, 'tcx, D> {
233+
impl<'s, 'tcx, D: ConstraintGraphDirection> graph::GraphSuccessors<'_>
234+
for RegionGraph<'s, 'tcx, D>
235+
{
234236
type Item = RegionVid;
235237
type Iter = Successors<'s, 'tcx, D>;
236238
}

Diff for: ‎compiler/rustc_borrowck/src/type_check/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2600,7 +2600,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
26002600
self.implicit_region_bound,
26012601
self.param_env,
26022602
location.to_locations(),
2603-
DUMMY_SP, // irrelevant; will be overrided.
2603+
DUMMY_SP, // irrelevant; will be overridden.
26042604
ConstraintCategory::Boring, // same as above.
26052605
&mut self.borrowck_context.constraints,
26062606
)

Diff for: ‎compiler/rustc_builtin_macros/src/format.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ struct MacroInput {
4242
fmtstr: P<Expr>,
4343
args: FormatArguments,
4444
/// Whether the first argument was a string literal or a result from eager macro expansion.
45-
/// If it's not a string literal, we disallow implicit arugment capturing.
45+
/// If it's not a string literal, we disallow implicit argument capturing.
4646
///
4747
/// This does not correspond to whether we can treat spans to the literal normally, as the whole
4848
/// invocation might be the result of another macro expansion, in which case this flag may still be true.

Diff for: ‎compiler/rustc_codegen_ssa/messages.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ codegen_ssa_msvc_missing_linker = the msvc targets depend on the msvc linker but
141141
142142
codegen_ssa_check_installed_visual_studio = please ensure that Visual Studio 2017 or later, or Build Tools for Visual Studio were installed with the Visual C++ option.
143143
144-
codegen_ssa_unsufficient_vs_code_product = VS Code is a different product, and is not sufficient.
144+
codegen_ssa_insufficient_vs_code_product = VS Code is a different product, and is not sufficient.
145145
146146
codegen_ssa_processing_dymutil_failed = processing debug info with `dsymutil` failed: {$status}
147147
.note = {$output}

Diff for: ‎compiler/rustc_codegen_ssa/src/back/link.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ fn link_natively<'a>(
923923
if sess.target.is_like_msvc && linker_not_found {
924924
sess.emit_note(errors::MsvcMissingLinker);
925925
sess.emit_note(errors::CheckInstalledVisualStudio);
926-
sess.emit_note(errors::UnsufficientVSCodeProduct);
926+
sess.emit_note(errors::InsufficientVSCodeProduct);
927927
}
928928
sess.abort_if_errors();
929929
}

Diff for: ‎compiler/rustc_codegen_ssa/src/errors.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,8 @@ pub struct MsvcMissingLinker;
405405
pub struct CheckInstalledVisualStudio;
406406

407407
#[derive(Diagnostic)]
408-
#[diag(codegen_ssa_unsufficient_vs_code_product)]
409-
pub struct UnsufficientVSCodeProduct;
408+
#[diag(codegen_ssa_insufficient_vs_code_product)]
409+
pub struct InsufficientVSCodeProduct;
410410

411411
#[derive(Diagnostic)]
412412
#[diag(codegen_ssa_processing_dymutil_failed)]

Diff for: ‎compiler/rustc_const_eval/src/const_eval/eval_queries.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ pub(crate) fn turn_into_const_value<'tcx>(
205205
let cid = key.value;
206206
let def_id = cid.instance.def.def_id();
207207
let is_static = tcx.is_static(def_id);
208-
// This is just accessing an already computed constant, so no need to check alginment here.
208+
// This is just accessing an already computed constant, so no need to check alignment here.
209209
let ecx = mk_eval_cx(
210210
tcx,
211211
tcx.def_span(key.value.instance.def_id()),

Diff for: ‎compiler/rustc_expand/messages.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,4 @@ expand_proc_macro_panicked =
135135
.help = message: {$message}
136136
137137
expand_proc_macro_derive_tokens =
138-
proc-macro derive produced unparseable tokens
138+
proc-macro derive produced unparsable tokens

Diff for: ‎compiler/rustc_feature/src/active.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ declare_features! (
309309
(active, associated_type_defaults, "1.2.0", Some(29661), None),
310310
/// Allows `async || body` closures.
311311
(active, async_closure, "1.37.0", Some(62290), None),
312-
/// Alows async functions to be declared, implemented, and used in traits.
312+
/// Allows async functions to be declared, implemented, and used in traits.
313313
(incomplete, async_fn_in_trait, "1.66.0", Some(91611), None),
314314
/// Allows `extern "C-unwind" fn` to enable unwinding across ABI boundaries.
315315
(active, c_unwind, "1.52.0", Some(74990), None),

Diff for: ‎compiler/rustc_hir_analysis/src/bounds.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ impl<'tcx> Bounds<'tcx> {
5858
pub fn push_sized(&mut self, tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, span: Span) {
5959
let sized_def_id = tcx.require_lang_item(LangItem::Sized, Some(span));
6060
let trait_ref = ty::Binder::dummy(tcx.mk_trait_ref(sized_def_id, [ty]));
61-
// Preferrable to put this obligation first, since we report better errors for sized ambiguity.
61+
// Preferable to put this obligation first, since we report better errors for sized ambiguity.
6262
self.predicates.insert(0, (trait_ref.without_const().to_predicate(tcx), span));
6363
}
6464

Diff for: ‎compiler/rustc_hir_typeck/src/demand.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
308308
let rcvr_ty = self.node_ty(rcvr.hir_id);
309309
// Get the evaluated type *after* calling the method call, so that the influence
310310
// of the arguments can be reflected in the receiver type. The receiver
311-
// expression has the type *before* theis analysis is done.
311+
// expression has the type *before* this analysis is done.
312312
let ty = match self.lookup_probe_for_diagnostic(
313313
segment.ident,
314314
rcvr_ty,

Diff for: ‎compiler/rustc_hir_typeck/src/expr.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
120120
ty
121121
}
122122

123-
pub(super) fn check_expr_coercable_to_type(
123+
pub(super) fn check_expr_coercible_to_type(
124124
&self,
125125
expr: &'tcx hir::Expr<'tcx>,
126126
expected: Ty<'tcx>,
@@ -1128,7 +1128,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
11281128
}
11291129
};
11301130

1131-
// This is (basically) inlined `check_expr_coercable_to_type`, but we want
1131+
// This is (basically) inlined `check_expr_coercible_to_type`, but we want
11321132
// to suggest an additional fixup here in `suggest_deref_binop`.
11331133
let rhs_ty = self.check_expr_with_hint(&rhs, lhs_ty);
11341134
if let (_, Some(mut diag)) =
@@ -1401,7 +1401,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
14011401

14021402
let (element_ty, t) = match uty {
14031403
Some(uty) => {
1404-
self.check_expr_coercable_to_type(&element, uty, None);
1404+
self.check_expr_coercible_to_type(&element, uty, None);
14051405
(uty, uty)
14061406
}
14071407
None => {
@@ -1478,7 +1478,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
14781478
let elt_ts_iter = elts.iter().enumerate().map(|(i, e)| match flds {
14791479
Some(fs) if i < fs.len() => {
14801480
let ety = fs[i];
1481-
self.check_expr_coercable_to_type(&e, ety, None);
1481+
self.check_expr_coercible_to_type(&e, ety, None);
14821482
ety
14831483
}
14841484
_ => self.check_expr_with_expectation(&e, NoExpectation),
@@ -2869,7 +2869,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
28692869
) -> Ty<'tcx> {
28702870
match self.resume_yield_tys {
28712871
Some((resume_ty, yield_ty)) => {
2872-
self.check_expr_coercable_to_type(&value, yield_ty, None);
2872+
self.check_expr_coercible_to_type(&value, yield_ty, None);
28732873

28742874
resume_ty
28752875
}
@@ -2878,7 +2878,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
28782878
// information. Hence, we check the source of the yield expression here and check its
28792879
// value's type against `()` (this check should always hold).
28802880
None if src.is_await() => {
2881-
self.check_expr_coercable_to_type(&value, self.tcx.mk_unit(), None);
2881+
self.check_expr_coercible_to_type(&value, self.tcx.mk_unit(), None);
28822882
self.tcx.mk_unit()
28832883
}
28842884
_ => {

Diff for: ‎compiler/rustc_hir_typeck/src/fn_ctxt/adjust_fulfillment_errors.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
466466
/// obligation. Hence we refine the `expr` "outwards-in" and bail at the first kind of expression/impl we don't recognize.
467467
///
468468
/// This function returns a `Result<&Expr, &Expr>` - either way, it returns the `Expr` whose span should be
469-
/// reported as an error. If it is `Ok`, then it means it refined successfull. If it is `Err`, then it may be
469+
/// reported as an error. If it is `Ok`, then it means it refined successful. If it is `Err`, then it may be
470470
/// only a partial success - but it cannot be refined even further.
471471
fn blame_specific_expr_if_possible_for_derived_predicate_obligation(
472472
&self,
@@ -534,7 +534,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
534534
/// - in_ty: `(Option<Vec<T>, bool)`
535535
/// we would drill until we arrive at `vec![1, 2, 3]`.
536536
///
537-
/// If successful, we return `Ok(refined_expr)`. If unsuccesful, we return `Err(partially_refined_expr`),
537+
/// If successful, we return `Ok(refined_expr)`. If unsuccessful, we return `Err(partially_refined_expr`),
538538
/// which will go as far as possible. For example, given `(foo(), false)` instead, we would drill to
539539
/// `foo()` and then return `Err("foo()")`.
540540
///

Diff for: ‎compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1413,7 +1413,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
14131413
self.demand_eqtype(init.span, local_ty, init_ty);
14141414
init_ty
14151415
} else {
1416-
self.check_expr_coercable_to_type(init, local_ty, None)
1416+
self.check_expr_coercible_to_type(init, local_ty, None)
14171417
}
14181418
}
14191419

Diff for: ‎compiler/rustc_hir_typeck/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ fn typeck_with_fallback<'tcx>(
280280
// Gather locals in statics (because of block expressions).
281281
GatherLocalsVisitor::new(&fcx).visit_body(body);
282282

283-
fcx.check_expr_coercable_to_type(&body.value, expected_type, None);
283+
fcx.check_expr_coercible_to_type(&body.value, expected_type, None);
284284

285285
fcx.write_ty(id, expected_type);
286286
};

Diff for: ‎compiler/rustc_hir_typeck/src/method/suggest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
300300
};
301301

302302
// We could pass the file for long types into these two, but it isn't strictly necessary
303-
// given how targetted they are.
303+
// given how targeted they are.
304304
if self.suggest_wrapping_range_with_parens(
305305
tcx,
306306
rcvr_ty,

Diff for: ‎compiler/rustc_hir_typeck/src/op.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
103103
match BinOpCategory::from(op) {
104104
BinOpCategory::Shortcircuit => {
105105
// && and || are a simple case.
106-
self.check_expr_coercable_to_type(lhs_expr, tcx.types.bool, None);
106+
self.check_expr_coercible_to_type(lhs_expr, tcx.types.bool, None);
107107
let lhs_diverges = self.diverges.get();
108-
self.check_expr_coercable_to_type(rhs_expr, tcx.types.bool, None);
108+
self.check_expr_coercible_to_type(rhs_expr, tcx.types.bool, None);
109109

110110
// Depending on the LHS' value, the RHS can never execute.
111111
self.diverges.set(lhs_diverges);
@@ -255,7 +255,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
255255
);
256256

257257
// see `NB` above
258-
let rhs_ty = self.check_expr_coercable_to_type(rhs_expr, rhs_ty_var, Some(lhs_expr));
258+
let rhs_ty = self.check_expr_coercible_to_type(rhs_expr, rhs_ty_var, Some(lhs_expr));
259259
let rhs_ty = self.resolve_vars_with_obligations(rhs_ty);
260260

261261
let return_ty = match result {

Diff for: ‎compiler/rustc_infer/messages.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ infer_region_explanation = {$pref_kind ->
174174
175175
infer_outlives_content = lifetime of reference outlives lifetime of borrowed content...
176176
infer_outlives_bound = lifetime of the source pointer does not outlive lifetime bound of the object type
177-
infer_fullfill_req_lifetime = the type `{$ty}` does not fulfill the required lifetime
177+
infer_fulfill_req_lifetime = the type `{$ty}` does not fulfill the required lifetime
178178
infer_lf_bound_not_satisfied = lifetime bound not satisfied
179179
infer_borrowed_too_long = a value of type `{$ty}` is borrowed for too long
180180
infer_ref_longer_than_data = in type `{$ty}`, reference has a longer lifetime than the data it references

0 commit comments

Comments
 (0)