nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-24 07:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor.

Browse Source
This commit is contained in:
Tor Hovland 2021-04-24 18:49:21 +02:00
parent 0e7489a2e9
commit 8bc81a0e4d
1 changed files with 23 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
compiler/rustc_typeck/src/check/fn_ctxt/suggestions.rs
View File

@ -8,7 +8,7 @@ use rustc_errors::{Applicability, DiagnosticBuilder};
use rustc_hir as hir;
use rustc_hir::def::{CtorOf, DefKind};
use rustc_hir::lang_items::LangItem;
use rustc_hir::{ExprKind, ItemKind, Node, StmtKind};
use rustc_hir::{Expr, ExprKind, ItemKind, Node, Stmt, StmtKind};
use rustc_infer::infer;
use rustc_middle::lint::in_external_macro;
use rustc_middle::ty::{self, Binder, Ty};
@ -489,8 +489,17 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}
let found = self.resolve_vars_with_obligations(found);
if self.in_loop(id) {
if self.in_local_statement(id) {
let in_loop = self.is_loop(id)
|| self.tcx.hir().parent_iter(id).any(|(parent_id, _)| self.is_loop(parent_id));
let in_local_statement = self.is_local_statement(id)
|| self
.tcx
.hir()
.parent_iter(id)
.any(|(parent_id, _)| self.is_local_statement(parent_id));
if in_loop && in_local_statement {
err.multipart_suggestion(
"you might have meant to break the loop with this value",
vec![
@ -501,7 +510,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
);
return;
}
}
if let hir::FnRetTy::Return(ty) = fn_decl.output {
let ty = <dyn AstConv<'_>>::ast_ty_to_ty(self, ty);
@ -533,55 +541,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}
}
fn in_loop(&self, id: hir::HirId) -> bool {
if self.is_loop(id) {
return true;
}
for (parent_id, _) in self.tcx.hir().parent_iter(id) {
if self.is_loop(parent_id) {
return true;
}
}
false
}
fn is_loop(&self, id: hir::HirId) -> bool {
let node = self.tcx.hir().get(id);
if let Node::Expr(expr) = node {
if let ExprKind::Loop(..) = expr.kind {
return true;
}
}
false
}
fn in_local_statement(&self, id: hir::HirId) -> bool {
if self.is_local_statement(id) {
return true;
}
for (parent_id, _) in self.tcx.hir().parent_iter(id) {
if self.is_local_statement(parent_id) {
return true;
}
}
false
matches!(node, Node::Expr(Expr { kind: ExprKind::Loop(..), .. }))
}
fn is_local_statement(&self, id: hir::HirId) -> bool {
let node = self.tcx.hir().get(id);
if let Node::Stmt(stmt) = node {
if let StmtKind::Local(..) = stmt.kind {
return true;
}
}
false
matches!(node, Node::Stmt(Stmt { kind: StmtKind::Local(..), .. }))
}
}