rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge commit '95c0459217d1661edfa794c8bb122452b92fb485' into clippyup

Browse Source
This commit is contained in:
flip1995
2021-01-30 18:06:34 +01:00
parent c18d6f1ffa
commit ac912be984
114 changed files with 6061 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
clippy_lints/src/cognitive_complexity.rs
View File

@@ -57,9 +57,9 @@ impl CognitiveComplexity {
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 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
@@ -136,12 +136,12 @@ impl<'tcx> LateLintPass<'tcx> for CognitiveComplexity {
}
}
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<'_>) {