Skip to content

Commit 23b0321

Browse files
committed
rebase and new fixes
1 parent c0c6774 commit 23b0321

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

compiler/rustc_hir/src/hir.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ impl<'hir> ConstArg<'hir, AmbigArg> {
299299
}
300300

301301
impl<'hir> ConstArg<'hir> {
302-
/// Converts a `ConstArg` in an unambigous position to one in an ambiguous position. This is
302+
/// Converts a `ConstArg` in an unambiguous position to one in an ambiguous position. This is
303303
/// fallible as the [`ConstArgKind::Infer`] variant is not present in ambiguous positions.
304304
///
305305
/// Functions accepting ambiguous consts will not handle the [`ConstArgKind::Infer`] variant, if
@@ -368,7 +368,7 @@ pub enum GenericArg<'hir> {
368368
Lifetime(&'hir Lifetime),
369369
Type(&'hir Ty<'hir, AmbigArg>),
370370
Const(&'hir ConstArg<'hir, AmbigArg>),
371-
/// Inference variables in [`GenericArg`] are always represnted by
371+
/// Inference variables in [`GenericArg`] are always represented by
372372
/// `GenericArg::Infer` instead of the `Infer` variants on [`TyKind`] and
373373
/// [`ConstArgKind`] as it is not clear until hir ty lowering whether a
374374
/// `_` argument is a type or const argument.
@@ -3147,7 +3147,7 @@ impl<'hir> Ty<'hir, AmbigArg> {
31473147
}
31483148

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

compiler/rustc_target/src/callconv/s390x.rs

Lines changed: 1 addition & 1 deletion
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)