use rustc_middle::hir::map::Map;
use rustc_session::{declare_tool_lint, impl_lint_pass};
use rustc_span::source_map::Span;
-use rustc_span::BytePos;
+use rustc_span::{sym, BytePos};
use crate::utils::{is_type_diagnostic_item, snippet_opt, span_lint_and_help, LimitStack};
let expr = &body.value;
- let mut helper = CCHelper { cc: 1, returns: 0 };
+ let mut helper = CcHelper { cc: 1, returns: 0 };
helper.visit_expr(expr);
- let CCHelper { cc, returns } = helper;
- let ret_ty = cx.tables().node_type(expr.hir_id);
- let ret_adjust = if is_type_diagnostic_item(cx, ret_ty, sym!(result_type)) {
+ let CcHelper { cc, returns } = helper;
+ let ret_ty = cx.typeck_results().node_type(expr.hir_id);
+ let ret_adjust = if is_type_diagnostic_item(cx, ret_ty, sym::result_type) {
returns
} else {
#[allow(clippy::integer_division)]
if rust_cc > self.limit.limit() {
let fn_span = match kind {
- FnKind::ItemFn(ident, _, _, _, _) | FnKind::Method(ident, _, _, _) => ident.span,
- FnKind::Closure(_) => {
+ FnKind::ItemFn(ident, _, _, _) | FnKind::Method(ident, _, _) => ident.span,
+ FnKind::Closure => {
let header_span = body_span.with_hi(decl.output.span().lo());
let pos = snippet_opt(cx, header_span).and_then(|snip| {
let low_offset = snip.find('|')?;
hir_id: HirId,
) {
let def_id = cx.tcx.hir().local_def_id(hir_id);
- if !cx.tcx.has_attr(def_id.to_def_id(), sym!(test)) {
+ if !cx.tcx.has_attr(def_id.to_def_id(), sym::test) {
self.check(cx, kind, decl, body, span);
}
}
}
}
-struct CCHelper {
+struct CcHelper {
cc: u64,
returns: u64,
}
-impl<'tcx> Visitor<'tcx> for CCHelper {
+impl<'tcx> Visitor<'tcx> for CcHelper {
type Map = Map<'tcx>;
fn visit_expr(&mut self, e: &'tcx Expr<'_>) {
walk_expr(self, e);
match e.kind {
+ ExprKind::If(_, _, _) => {
+ self.cc += 1;
+ },
ExprKind::Match(_, ref arms, _) => {
if arms.len() > 1 {
self.cc += 1;