Skip to content

Commit f4d794e

Browse files
committed
Auto merge of rust-lang#119368 - coder-s-cat:master, r=WaffleLapkin
Fix some comments
2 parents 928b3da + 1adf0c1 commit f4d794e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
482482
span: Span,
483483
use_spans: UseSpans<'tcx>,
484484
) -> DiagnosticBuilder<'cx> {
485-
// We need all statements in the body where the binding was assigned to to later find all
485+
// We need all statements in the body where the binding was assigned to later find all
486486
// the branching code paths where the binding *wasn't* assigned to.
487487
let inits = &self.move_data.init_path_map[mpi];
488488
let move_path = &self.move_data.move_paths[mpi];

compiler/rustc_hir_analysis/src/check/compare_impl_item/refine.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub(super) fn check_refining_return_position_impl_trait_in_trait<'tcx>(
3232
return;
3333
}
3434

35-
// If a type in the trait ref is private, then there's also no reason to to do this check.
35+
// If a type in the trait ref is private, then there's also no reason to do this check.
3636
let impl_def_id = impl_m.container_id(tcx);
3737
for arg in impl_trait_ref.args {
3838
if let Some(ty) = arg.as_type()

compiler/rustc_hir_typeck/src/pat.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2080,7 +2080,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
20802080
/// ```
20812081
///
20822082
/// If we're in an irrefutable pattern we prefer the array impl candidate given that
2083-
/// the slice impl candidate would be be rejected anyway (if no ambiguity existed).
2083+
/// the slice impl candidate would be rejected anyway (if no ambiguity existed).
20842084
fn pat_is_irrefutable(&self, decl_origin: Option<DeclOrigin<'_>>) -> bool {
20852085
match decl_origin {
20862086
Some(DeclOrigin::LocalDecl { els: None }) => true,

compiler/rustc_mir_transform/src/large_enums.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use rustc_target::abi::{HasDataLayout, Size, TagEncoding, Variants};
99
/// A pass that seeks to optimize unnecessary moves of large enum types, if there is a large
1010
/// enough discrepancy between them.
1111
///
12-
/// i.e. If there is are two variants:
12+
/// i.e. If there are two variants:
1313
/// ```
1414
/// enum Example {
1515
/// Small,

0 commit comments

Comments
 (0)