Auto merge of #119368 - coder-s-cat:master, r=WaffleLapkin
Fix some comments
This commit is contained in:
commit
f4d794ea0b
4 changed files with 4 additions and 4 deletions
|
@ -482,7 +482,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
|
||||||
span: Span,
|
span: Span,
|
||||||
use_spans: UseSpans<'tcx>,
|
use_spans: UseSpans<'tcx>,
|
||||||
) -> DiagnosticBuilder<'cx> {
|
) -> DiagnosticBuilder<'cx> {
|
||||||
// We need all statements in the body where the binding was assigned to to later find all
|
// We need all statements in the body where the binding was assigned to later find all
|
||||||
// the branching code paths where the binding *wasn't* assigned to.
|
// the branching code paths where the binding *wasn't* assigned to.
|
||||||
let inits = &self.move_data.init_path_map[mpi];
|
let inits = &self.move_data.init_path_map[mpi];
|
||||||
let move_path = &self.move_data.move_paths[mpi];
|
let move_path = &self.move_data.move_paths[mpi];
|
||||||
|
|
|
@ -32,7 +32,7 @@ pub(super) fn check_refining_return_position_impl_trait_in_trait<'tcx>(
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// If a type in the trait ref is private, then there's also no reason to to do this check.
|
// If a type in the trait ref is private, then there's also no reason to do this check.
|
||||||
let impl_def_id = impl_m.container_id(tcx);
|
let impl_def_id = impl_m.container_id(tcx);
|
||||||
for arg in impl_trait_ref.args {
|
for arg in impl_trait_ref.args {
|
||||||
if let Some(ty) = arg.as_type()
|
if let Some(ty) = arg.as_type()
|
||||||
|
|
|
@ -2080,7 +2080,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
|
||||||
/// ```
|
/// ```
|
||||||
///
|
///
|
||||||
/// If we're in an irrefutable pattern we prefer the array impl candidate given that
|
/// If we're in an irrefutable pattern we prefer the array impl candidate given that
|
||||||
/// the slice impl candidate would be be rejected anyway (if no ambiguity existed).
|
/// the slice impl candidate would be rejected anyway (if no ambiguity existed).
|
||||||
fn pat_is_irrefutable(&self, decl_origin: Option<DeclOrigin<'_>>) -> bool {
|
fn pat_is_irrefutable(&self, decl_origin: Option<DeclOrigin<'_>>) -> bool {
|
||||||
match decl_origin {
|
match decl_origin {
|
||||||
Some(DeclOrigin::LocalDecl { els: None }) => true,
|
Some(DeclOrigin::LocalDecl { els: None }) => true,
|
||||||
|
|
|
@ -9,7 +9,7 @@ use rustc_target::abi::{HasDataLayout, Size, TagEncoding, Variants};
|
||||||
/// A pass that seeks to optimize unnecessary moves of large enum types, if there is a large
|
/// A pass that seeks to optimize unnecessary moves of large enum types, if there is a large
|
||||||
/// enough discrepancy between them.
|
/// enough discrepancy between them.
|
||||||
///
|
///
|
||||||
/// i.e. If there is are two variants:
|
/// i.e. If there are two variants:
|
||||||
/// ```
|
/// ```
|
||||||
/// enum Example {
|
/// enum Example {
|
||||||
/// Small,
|
/// Small,
|
||||||
|
|
Loading…
Add table
Reference in a new issue