bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

take care when there is no args in method call

Browse source
This commit is contained in:
yukang 2023-01-08 00:32:40 +08:00
parent c82545955e
commit eafbca9166
1 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
View file

@ -1,6 +1,4 @@
use crate::diagnostics::mutability_errors::mut_borrow_of_mutable_ref;
use either::Either; use either::Either;
use hir::Closure;
use rustc_const_eval::util::CallKind; use rustc_const_eval::util::CallKind;
use rustc_data_structures::captures::Captures; use rustc_data_structures::captures::Captures;
use rustc_data_structures::fx::FxHashSet; use rustc_data_structures::fx::FxHashSet;
@ -8,6 +6,7 @@ use rustc_errors::{
struct_span_err, Applicability, Diagnostic, DiagnosticBuilder, ErrorGuaranteed, MultiSpan, struct_span_err, Applicability, Diagnostic, DiagnosticBuilder, ErrorGuaranteed, MultiSpan,
}; };
use rustc_hir as hir; use rustc_hir as hir;
use rustc_hir::def::Res;
use rustc_hir::intravisit::{walk_block, walk_expr, Visitor}; use rustc_hir::intravisit::{walk_block, walk_expr, Visitor};
use rustc_hir::{AsyncGeneratorKind, GeneratorKind, LangItem}; use rustc_hir::{AsyncGeneratorKind, GeneratorKind, LangItem};
use rustc_infer::infer::TyCtxtInferExt; use rustc_infer::infer::TyCtxtInferExt;
@ -31,6 +30,7 @@ use crate::borrowck_errors;
use crate::diagnostics::conflict_errors::StorageDeadOrDrop::LocalStorageDead; use crate::diagnostics::conflict_errors::StorageDeadOrDrop::LocalStorageDead;
use crate::diagnostics::find_all_local_uses; use crate::diagnostics::find_all_local_uses;
use crate::diagnostics::mutability_errors::mut_borrow_of_mutable_ref;
use crate::{ use crate::{
borrow_set::BorrowData, diagnostics::Instance, prefixes::IsPrefixOf, borrow_set::BorrowData, diagnostics::Instance, prefixes::IsPrefixOf,
InitializationRequiringAction, MirBorrowckCtxt, PrefixSet, WriteKind, InitializationRequiringAction, MirBorrowckCtxt, PrefixSet, WriteKind,
@ -41,8 +41,6 @@ use super::{
DescribePlaceOpt, RegionName, RegionNameSource, UseSpans, DescribePlaceOpt, RegionName, RegionNameSource, UseSpans,
}; };
use rustc_hir::def::Res;
#[derive(Debug)] #[derive(Debug)]
struct MoveSite { struct MoveSite {
/// Index of the "move out" that we found. The `MoveData` can /// Index of the "move out" that we found. The `MoveData` can
@ -1280,7 +1278,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
impl<'hir> Visitor<'hir> for ExpressionFinder<'hir> { impl<'hir> Visitor<'hir> for ExpressionFinder<'hir> {
fn visit_expr(&mut self, e: &'hir hir::Expr<'hir>) { fn visit_expr(&mut self, e: &'hir hir::Expr<'hir>) {
if e.span.contains(self.capture_span) { if e.span.contains(self.capture_span) {
if let hir::ExprKind::Closure(&Closure { if let hir::ExprKind::Closure(&hir::Closure {
movability: None, movability: None,
body, body,
fn_arg_span, fn_arg_span,
@ -1311,7 +1309,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
if let hir::Pat { kind: hir::PatKind::Binding(_, hir_id, _ident, _), .. } = local.pat && if let hir::Pat { kind: hir::PatKind::Binding(_, hir_id, _ident, _), .. } = local.pat &&
let Some(init) = local.init let Some(init) = local.init
{ {
if let hir::Expr { kind: hir::ExprKind::Closure(&Closure { if let hir::Expr { kind: hir::ExprKind::Closure(&hir::Closure {
movability: None, movability: None,
.. ..
}), .. } = init && }), .. } = init &&
@ -1328,11 +1326,13 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
let hir::QPath::Resolved(_, hir::Path { segments: [seg], ..}) = path && let hir::QPath::Resolved(_, hir::Path { segments: [seg], ..}) = path &&
let Res::Local(hir_id) = seg.res && let Res::Local(hir_id) = seg.res &&
Some(hir_id) == self.closure_local_id { Some(hir_id) == self.closure_local_id {
let mut arg_str = "self".to_string(); let (span, arg_str) = if args.len() > 0 {
if args.len() > 0 { (args[0].span.shrink_to_lo(), "self, ".to_string())
arg_str.push_str(", "); } else {
} let span = e.span.trim_start(seg.ident.span).unwrap_or(e.span);
self.closure_call_changes.push((seg.ident.span, arg_str)); (span, "(self)".to_string())
};
self.closure_call_changes.push((span, arg_str));
} }
hir::intravisit::walk_stmt(self, s); hir::intravisit::walk_stmt(self, s);
} }
@ -1369,9 +1369,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
} }
for (span, suggest) in finder.closure_call_changes { for (span, suggest) in finder.closure_call_changes {
if let Ok(span) = sm.span_extend_while(span, |c| c != '(') { sugg.push((span, suggest));
sugg.push((sm.next_point(span).shrink_to_hi(), suggest));
}
} }
err.multipart_suggestion_verbose( err.multipart_suggestion_verbose(