Skip to content

Commit 0f18488

Browse files
committed
rebase and new fixes
1 parent f1adfe2 commit 0f18488

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

compiler/rustc_hir/src/hir.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ impl<'hir> ConstArg<'hir, AmbigArg> {
297297
}
298298

299299
impl<'hir> ConstArg<'hir> {
300-
/// Converts a `ConstArg` in an unambigous position to one in an ambiguous position. This is
300+
/// Converts a `ConstArg` in an unambiguous position to one in an ambiguous position. This is
301301
/// fallible as the [`ConstArgKind::Infer`] variant is not present in ambiguous positions.
302302
///
303303
/// Functions accepting ambiguous consts will not handle the [`ConstArgKind::Infer`] variant, if
@@ -366,7 +366,7 @@ pub enum GenericArg<'hir> {
366366
Lifetime(&'hir Lifetime),
367367
Type(&'hir Ty<'hir, AmbigArg>),
368368
Const(&'hir ConstArg<'hir, AmbigArg>),
369-
/// Inference variables in [`GenericArg`] are always represnted by
369+
/// Inference variables in [`GenericArg`] are always represented by
370370
/// `GenericArg::Infer` instead of the `Infer` variants on [`TyKind`] and
371371
/// [`ConstArgKind`] as it is not clear until hir ty lowering whether a
372372
/// `_` argument is a type or const argument.
@@ -3041,7 +3041,7 @@ impl<'hir> Ty<'hir, AmbigArg> {
30413041
}
30423042

30433043
impl<'hir> Ty<'hir> {
3044-
/// Converts a `Ty` in an unambigous position to one in an ambiguous position. This is
3044+
/// Converts a `Ty` in an unambiguous position to one in an ambiguous position. This is
30453045
/// fallible as the [`TyKind::Infer`] variant is not present in ambiguous positions.
30463046
///
30473047
/// Functions accepting ambiguous types will not handle the [`TyKind::Infer`] variant, if

compiler/rustc_hir/src/intravisit.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ pub trait Visitor<'v>: Sized {
363363
/// See the doc comments on [`Ty`] for an explanation of what it means for a type to be
364364
/// ambiguous.
365365
///
366-
/// The [`Visitor::visit_infer`] method should be overriden in order to handle infer vars.
366+
/// The [`Visitor::visit_infer`] method should be overridden in order to handle infer vars.
367367
fn visit_ty(&mut self, t: &'v Ty<'v, AmbigArg>) -> Self::Result {
368368
walk_ty(self, t)
369369
}
@@ -374,7 +374,7 @@ pub trait Visitor<'v>: Sized {
374374
/// See the doc comments on [`ConstArg`] for an explanation of what it means for a const to be
375375
/// ambiguous.
376376
///
377-
/// The [`Visitor::visit_infer`] method should be overriden in order to handle infer vars.
377+
/// The [`Visitor::visit_infer`] method should be overridden in order to handle infer vars.
378378
fn visit_const_arg(&mut self, c: &'v ConstArg<'v, AmbigArg>) -> Self::Result {
379379
walk_ambig_const_arg(self, c)
380380
}

compiler/rustc_target/src/callconv/s390x.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ where
4646
}
4747

4848
if arg.layout.is_single_vector_element(cx, size) {
49-
// pass non-transparant wrappers around a vector as `PassMode::Cast`
49+
// pass non-transparent wrappers around a vector as `PassMode::Cast`
5050
arg.cast_to(Reg { kind: RegKind::Vector, size });
5151
return;
5252
}

0 commit comments

Comments
 (0)