Improve cognitive_complexity lint's warning.

iddm · iddm · commit 87ef86ef5a8e · 2019-08-29T11:54:18.000+02:00
Adds the value of complexity limit set for the lint to the warning. Fixes #4466 Signed-off-by: Victor Polevoy <fx@thefx.co>
diff --git a/clippy_lints/src/cognitive_complexity.rs b/clippy_lints/src/cognitive_complexity.rs
@@ -100,7 +100,11 @@ impl CognitiveComplexity {
                     cx,
                     COGNITIVE_COMPLEXITY,
                     span,
-                    &format!("the function has a cognitive complexity of {}", rust_cc),
+                    &format!(
+                        "the function has a cognitive complexity of ({}/{})",
+                        rust_cc,
+                        self.limit.limit()
+                    ),
                     "you could split it up into multiple smaller functions",
                 );
             }
diff --git a/tests/ui/cognitive_complexity.stderr b/tests/ui/cognitive_complexity.stderr
@@ -1,4 +1,4 @@
-error: the function has a cognitive complexity of 28
+error: the function has a cognitive complexity of (28/25)
   --> $DIR/cognitive_complexity.rs:6:1
    |
 LL | / fn main() {
@@ -13,7 +13,7 @@ LL | | }
    = note: `-D clippy::cognitive-complexity` implied by `-D warnings`
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 7
+error: the function has a cognitive complexity of (7/0)
   --> $DIR/cognitive_complexity.rs:91:1
    |
 LL | / fn kaboom() {
@@ -27,7 +27,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 1
+error: the function has a cognitive complexity of (1/0)
   --> $DIR/cognitive_complexity.rs:137:1
    |
 LL | / fn lots_of_short_circuits() -> bool {
@@ -37,7 +37,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 1
+error: the function has a cognitive complexity of (1/0)
   --> $DIR/cognitive_complexity.rs:142:1
    |
 LL | / fn lots_of_short_circuits2() -> bool {
@@ -47,7 +47,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 2
+error: the function has a cognitive complexity of (2/0)
   --> $DIR/cognitive_complexity.rs:147:1
    |
 LL | / fn baa() {
@@ -61,7 +61,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 2
+error: the function has a cognitive complexity of (2/0)
   --> $DIR/cognitive_complexity.rs:148:13
    |
 LL |       let x = || match 99 {
@@ -76,7 +76,7 @@ LL | |     };
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 2
+error: the function has a cognitive complexity of (2/0)
   --> $DIR/cognitive_complexity.rs:165:1
    |
 LL | / fn bar() {
@@ -89,7 +89,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 2
+error: the function has a cognitive complexity of (2/0)
   --> $DIR/cognitive_complexity.rs:184:1
    |
 LL | / fn barr() {
@@ -103,7 +103,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 3
+error: the function has a cognitive complexity of (3/0)
   --> $DIR/cognitive_complexity.rs:194:1
    |
 LL | / fn barr2() {
@@ -117,7 +117,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 2
+error: the function has a cognitive complexity of (2/0)
   --> $DIR/cognitive_complexity.rs:210:1
    |
 LL | / fn barrr() {
@@ -131,7 +131,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 3
+error: the function has a cognitive complexity of (3/0)
   --> $DIR/cognitive_complexity.rs:220:1
    |
 LL | / fn barrr2() {
@@ -145,7 +145,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 2
+error: the function has a cognitive complexity of (2/0)
   --> $DIR/cognitive_complexity.rs:236:1
    |
 LL | / fn barrrr() {
@@ -159,7 +159,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 3
+error: the function has a cognitive complexity of (3/0)
   --> $DIR/cognitive_complexity.rs:246:1
    |
 LL | / fn barrrr2() {
@@ -173,7 +173,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 2
+error: the function has a cognitive complexity of (2/0)
   --> $DIR/cognitive_complexity.rs:262:1
    |
 LL | / fn cake() {
@@ -187,7 +187,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 4
+error: the function has a cognitive complexity of (4/0)
   --> $DIR/cognitive_complexity.rs:272:1
    |
 LL | / pub fn read_file(input_path: &str) -> String {
@@ -201,7 +201,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 1
+error: the function has a cognitive complexity of (1/0)
   --> $DIR/cognitive_complexity.rs:303:1
    |
 LL | / fn void(void: Void) {
@@ -213,7 +213,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 1
+error: the function has a cognitive complexity of (1/0)
   --> $DIR/cognitive_complexity.rs:316:1
    |
 LL | / fn try_() -> Result<i32, &'static str> {
@@ -226,7 +226,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 1
+error: the function has a cognitive complexity of (1/0)
   --> $DIR/cognitive_complexity.rs:324:1
    |
 LL | / fn try_again() -> Result<i32, &'static str> {
@@ -240,7 +240,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 1
+error: the function has a cognitive complexity of (1/0)
   --> $DIR/cognitive_complexity.rs:340:1
    |
 LL | / fn early() -> Result<i32, &'static str> {
@@ -254,7 +254,7 @@ LL | | }
    |
    = help: you could split it up into multiple smaller functions
 
-error: the function has a cognitive complexity of 8
+error: the function has a cognitive complexity of (8/0)
   --> $DIR/cognitive_complexity.rs:354:1
    |
 LL | / fn early_ret() -> i32 {
diff --git a/tests/ui/cognitive_complexity_attr_used.stderr b/tests/ui/cognitive_complexity_attr_used.stderr
@@ -1,4 +1,4 @@
-error: the function has a cognitive complexity of 3
+error: the function has a cognitive complexity of (3/0)
   --> $DIR/cognitive_complexity_attr_used.rs:9:1
    |
 LL | / fn kaboom() {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-error: the function has a cognitive complexity of 28`
	`1`	`+error: the function has a cognitive complexity of (28/25)`
`2`	`2`	`--> $DIR/cognitive_complexity.rs:6:1`
`3`	`3`	`\|`
`4`	`4`	`LL \| / fn main() {`
`@@ -13,7 +13,7 @@ LL \| \| }`
`13`	`13`	= note: `-D clippy::cognitive-complexity` implied by `-D warnings`
`14`	`14`	`= help: you could split it up into multiple smaller functions`
`15`	`15`
`16`		`-error: the function has a cognitive complexity of 7`
	`16`	`+error: the function has a cognitive complexity of (7/0)`
`17`	`17`	`--> $DIR/cognitive_complexity.rs:91:1`
`18`	`18`	`\|`
`19`	`19`	`LL \| / fn kaboom() {`
`@@ -27,7 +27,7 @@ LL \| \| }`
`27`	`27`	`\|`
`28`	`28`	`= help: you could split it up into multiple smaller functions`
`29`	`29`
`30`		`-error: the function has a cognitive complexity of 1`
	`30`	`+error: the function has a cognitive complexity of (1/0)`
`31`	`31`	`--> $DIR/cognitive_complexity.rs:137:1`
`32`	`32`	`\|`
`33`	`33`	`LL \| / fn lots_of_short_circuits() -> bool {`
`@@ -37,7 +37,7 @@ LL \| \| }`
`37`	`37`	`\|`
`38`	`38`	`= help: you could split it up into multiple smaller functions`
`39`	`39`
`40`		`-error: the function has a cognitive complexity of 1`
	`40`	`+error: the function has a cognitive complexity of (1/0)`
`41`	`41`	`--> $DIR/cognitive_complexity.rs:142:1`
`42`	`42`	`\|`
`43`	`43`	`LL \| / fn lots_of_short_circuits2() -> bool {`
`@@ -47,7 +47,7 @@ LL \| \| }`
`47`	`47`	`\|`
`48`	`48`	`= help: you could split it up into multiple smaller functions`
`49`	`49`
`50`		`-error: the function has a cognitive complexity of 2`
	`50`	`+error: the function has a cognitive complexity of (2/0)`
`51`	`51`	`--> $DIR/cognitive_complexity.rs:147:1`
`52`	`52`	`\|`
`53`	`53`	`LL \| / fn baa() {`
`@@ -61,7 +61,7 @@ LL \| \| }`
`61`	`61`	`\|`
`62`	`62`	`= help: you could split it up into multiple smaller functions`
`63`	`63`
`64`		`-error: the function has a cognitive complexity of 2`
	`64`	`+error: the function has a cognitive complexity of (2/0)`
`65`	`65`	`--> $DIR/cognitive_complexity.rs:148:13`
`66`	`66`	`\|`
`67`	`67`	`LL \| let x = \|\| match 99 {`
`@@ -76,7 +76,7 @@ LL \| \| };`
`76`	`76`	`\|`
`77`	`77`	`= help: you could split it up into multiple smaller functions`
`78`	`78`
`79`		`-error: the function has a cognitive complexity of 2`
	`79`	`+error: the function has a cognitive complexity of (2/0)`
`80`	`80`	`--> $DIR/cognitive_complexity.rs:165:1`
`81`	`81`	`\|`
`82`	`82`	`LL \| / fn bar() {`
`@@ -89,7 +89,7 @@ LL \| \| }`
`89`	`89`	`\|`
`90`	`90`	`= help: you could split it up into multiple smaller functions`
`91`	`91`
`92`		`-error: the function has a cognitive complexity of 2`
	`92`	`+error: the function has a cognitive complexity of (2/0)`
`93`	`93`	`--> $DIR/cognitive_complexity.rs:184:1`
`94`	`94`	`\|`
`95`	`95`	`LL \| / fn barr() {`
`@@ -103,7 +103,7 @@ LL \| \| }`
`103`	`103`	`\|`
`104`	`104`	`= help: you could split it up into multiple smaller functions`
`105`	`105`
`106`		`-error: the function has a cognitive complexity of 3`
	`106`	`+error: the function has a cognitive complexity of (3/0)`
`107`	`107`	`--> $DIR/cognitive_complexity.rs:194:1`
`108`	`108`	`\|`
`109`	`109`	`LL \| / fn barr2() {`
`@@ -117,7 +117,7 @@ LL \| \| }`
`117`	`117`	`\|`
`118`	`118`	`= help: you could split it up into multiple smaller functions`
`119`	`119`
`120`		`-error: the function has a cognitive complexity of 2`
	`120`	`+error: the function has a cognitive complexity of (2/0)`
`121`	`121`	`--> $DIR/cognitive_complexity.rs:210:1`
`122`	`122`	`\|`
`123`	`123`	`LL \| / fn barrr() {`
`@@ -131,7 +131,7 @@ LL \| \| }`
`131`	`131`	`\|`
`132`	`132`	`= help: you could split it up into multiple smaller functions`
`133`	`133`
`134`		`-error: the function has a cognitive complexity of 3`
	`134`	`+error: the function has a cognitive complexity of (3/0)`
`135`	`135`	`--> $DIR/cognitive_complexity.rs:220:1`
`136`	`136`	`\|`
`137`	`137`	`LL \| / fn barrr2() {`
`@@ -145,7 +145,7 @@ LL \| \| }`
`145`	`145`	`\|`
`146`	`146`	`= help: you could split it up into multiple smaller functions`
`147`	`147`
`148`		`-error: the function has a cognitive complexity of 2`
	`148`	`+error: the function has a cognitive complexity of (2/0)`
`149`	`149`	`--> $DIR/cognitive_complexity.rs:236:1`
`150`	`150`	`\|`
`151`	`151`	`LL \| / fn barrrr() {`
`@@ -159,7 +159,7 @@ LL \| \| }`
`159`	`159`	`\|`
`160`	`160`	`= help: you could split it up into multiple smaller functions`
`161`	`161`
`162`		`-error: the function has a cognitive complexity of 3`
	`162`	`+error: the function has a cognitive complexity of (3/0)`
`163`	`163`	`--> $DIR/cognitive_complexity.rs:246:1`
`164`	`164`	`\|`
`165`	`165`	`LL \| / fn barrrr2() {`
`@@ -173,7 +173,7 @@ LL \| \| }`
`173`	`173`	`\|`
`174`	`174`	`= help: you could split it up into multiple smaller functions`
`175`	`175`
`176`		`-error: the function has a cognitive complexity of 2`
	`176`	`+error: the function has a cognitive complexity of (2/0)`
`177`	`177`	`--> $DIR/cognitive_complexity.rs:262:1`
`178`	`178`	`\|`
`179`	`179`	`LL \| / fn cake() {`
`@@ -187,7 +187,7 @@ LL \| \| }`
`187`	`187`	`\|`
`188`	`188`	`= help: you could split it up into multiple smaller functions`
`189`	`189`
`190`		`-error: the function has a cognitive complexity of 4`
	`190`	`+error: the function has a cognitive complexity of (4/0)`
`191`	`191`	`--> $DIR/cognitive_complexity.rs:272:1`
`192`	`192`	`\|`
`193`	`193`	`LL \| / pub fn read_file(input_path: &str) -> String {`
`@@ -201,7 +201,7 @@ LL \| \| }`
`201`	`201`	`\|`
`202`	`202`	`= help: you could split it up into multiple smaller functions`
`203`	`203`
`204`		`-error: the function has a cognitive complexity of 1`
	`204`	`+error: the function has a cognitive complexity of (1/0)`
`205`	`205`	`--> $DIR/cognitive_complexity.rs:303:1`
`206`	`206`	`\|`
`207`	`207`	`LL \| / fn void(void: Void) {`
`@@ -213,7 +213,7 @@ LL \| \| }`
`213`	`213`	`\|`
`214`	`214`	`= help: you could split it up into multiple smaller functions`
`215`	`215`
`216`		`-error: the function has a cognitive complexity of 1`
	`216`	`+error: the function has a cognitive complexity of (1/0)`
`217`	`217`	`--> $DIR/cognitive_complexity.rs:316:1`
`218`	`218`	`\|`
`219`	`219`	`LL \| / fn try_() -> Result<i32, &'static str> {`
`@@ -226,7 +226,7 @@ LL \| \| }`
`226`	`226`	`\|`
`227`	`227`	`= help: you could split it up into multiple smaller functions`
`228`	`228`
`229`		`-error: the function has a cognitive complexity of 1`
	`229`	`+error: the function has a cognitive complexity of (1/0)`
`230`	`230`	`--> $DIR/cognitive_complexity.rs:324:1`
`231`	`231`	`\|`
`232`	`232`	`LL \| / fn try_again() -> Result<i32, &'static str> {`
`@@ -240,7 +240,7 @@ LL \| \| }`
`240`	`240`	`\|`
`241`	`241`	`= help: you could split it up into multiple smaller functions`
`242`	`242`
`243`		`-error: the function has a cognitive complexity of 1`
	`243`	`+error: the function has a cognitive complexity of (1/0)`
`244`	`244`	`--> $DIR/cognitive_complexity.rs:340:1`
`245`	`245`	`\|`
`246`	`246`	`LL \| / fn early() -> Result<i32, &'static str> {`
`@@ -254,7 +254,7 @@ LL \| \| }`
`254`	`254`	`\|`
`255`	`255`	`= help: you could split it up into multiple smaller functions`
`256`	`256`
`257`		`-error: the function has a cognitive complexity of 8`
	`257`	`+error: the function has a cognitive complexity of (8/0)`
`258`	`258`	`--> $DIR/cognitive_complexity.rs:354:1`
`259`	`259`	`\|`
`260`	`260`	`LL \| / fn early_ret() -> i32 {`