Skip to content

Commit 70afeb9

Browse files
authored
Rollup merge of rust-lang#138270 - StevenMia:master, r=compiler-errors
chore: Fix some comments Fix some comments
2 parents 19b5d58 + 3583554 commit 70afeb9

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

compiler/rustc_borrowck/src/type_check/liveness/trace.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ impl<'tcx> LivenessContext<'_, '_, '_, 'tcx> {
610610
Err(ErrorGuaranteed { .. }) => {
611611
// We don't run dropck on HIR, and dropck looks inside fields of
612612
// types, so there's no guarantee that it succeeds. We also
613-
// can't rely on the the `ErrorGuaranteed` from `fully_perform` here
613+
// can't rely on the `ErrorGuaranteed` from `fully_perform` here
614614
// because it comes from delay_span_bug.
615615
//
616616
// Do this inside of a probe because we don't particularly care (or want)

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_lint/src/default_could_be_derived.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ impl<'tcx> LateLintPass<'tcx> for DefaultCouldBeDerived {
133133
return;
134134
}
135135

136-
// At least one of the fields with a default value have been overriden in
136+
// At least one of the fields with a default value have been overridden in
137137
// the `Default` implementation. We suggest removing it and relying on `..`
138138
// instead.
139139
let any_default_field_given =

src/doc/unstable-book/src/language-features/default-field-values.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ have default field values.
6767
## Lints
6868

6969
When manually implementing the `Default` trait for a type that has default
70-
field values, if any of these are overriden in the impl the
70+
field values, if any of these are overridden in the impl the
7171
`default_overrides_default_fields` lint will trigger. This lint is in place
7272
to avoid surprising diverging behavior between `S { .. }` and
7373
`S::default()`, where using the same type in both ways could result in

tests/ui/check-cfg/allow-same-level.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// It should work, but due to interactions between how #[cfg]s are
55
// expanded, the lint machinery and the check-cfg impl, we
6-
// miss the #[allow], althrough we probably shoudln't.
6+
// miss the #[allow], althrough we probably shouldn't.
77
//
88
// cf. https://github.com/rust-lang/rust/issues/124735
99
//

0 commit comments

Comments
 (0)