Skip to content

Commit b36389a

Browse files
committed
rebase and new fixes
1 parent 30e53af commit b36389a

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

compiler/rustc_hir/src/hir.rs

Lines changed: 3 additions & 3 deletions
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ pub trait Visitor<'v>: Sized {
365365
/// See the doc comments on [`Ty`] for an explanation of what it means for a type to be
366366
/// ambiguous.
367367
///
368-
/// The [`Visitor::visit_infer`] method should be overriden in order to handle infer vars.
368+
/// The [`Visitor::visit_infer`] method should be overridden in order to handle infer vars.
369369
fn visit_ty(&mut self, t: &'v Ty<'v, AmbigArg>) -> Self::Result {
370370
walk_ty(self, t)
371371
}
@@ -376,7 +376,7 @@ pub trait Visitor<'v>: Sized {
376376
/// See the doc comments on [`ConstArg`] for an explanation of what it means for a const to be
377377
/// ambiguous.
378378
///
379-
/// The [`Visitor::visit_infer`] method should be overriden in order to handle infer vars.
379+
/// The [`Visitor::visit_infer`] method should be overridden in order to handle infer vars.
380380
fn visit_const_arg(&mut self, c: &'v ConstArg<'v, AmbigArg>) -> Self::Result {
381381
walk_ambig_const_arg(self, c)
382382
}

compiler/rustc_target/src/callconv/s390x.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ where
4545
}
4646

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

0 commit comments

Comments
 (0)