From 3a97b5fa2048211b16d362be34293912fe996113 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 13 Jan 2019 16:26:20 -0500 Subject: [PATCH] Moving tests to ui-toml to make use of clippy.toml --- tests/ui-toml/functions_maxlines/clippy.toml | 1 + tests/ui-toml/functions_maxlines/test.rs | 44 +++++ tests/ui-toml/functions_maxlines/test.stderr | 23 +++ tests/ui/functions_maxlines.rs | 162 ------------------- tests/ui/functions_maxlines.stderr | 16 -- 5 files changed, 68 insertions(+), 178 deletions(-) create mode 100644 tests/ui-toml/functions_maxlines/clippy.toml create mode 100644 tests/ui-toml/functions_maxlines/test.rs create mode 100644 tests/ui-toml/functions_maxlines/test.stderr delete mode 100644 tests/ui/functions_maxlines.rs delete mode 100644 tests/ui/functions_maxlines.stderr diff --git a/tests/ui-toml/functions_maxlines/clippy.toml b/tests/ui-toml/functions_maxlines/clippy.toml new file mode 100644 index 00000000000..951dbb523d9 --- /dev/null +++ b/tests/ui-toml/functions_maxlines/clippy.toml @@ -0,0 +1 @@ +too-many-lines-threshold = 1 diff --git a/tests/ui-toml/functions_maxlines/test.rs b/tests/ui-toml/functions_maxlines/test.rs new file mode 100644 index 00000000000..6ee75e4dbc1 --- /dev/null +++ b/tests/ui-toml/functions_maxlines/test.rs @@ -0,0 +1,44 @@ +#![warn(clippy::too_many_lines)] + + +// This function should be considered one line. +fn many_comments_but_one_line_of_code() { + /* println!("This is good."); */ + // println!("This is good."); + /* */ // println!("This is good."); + /* */ // println!("This is good."); + /* */ // println!("This is good."); + /* */ // println!("This is good."); + /* println!("This is good."); + println!("This is good."); + println!("This is good."); */ + println!("This is good."); +} + +// This should be considered two and a fail. +fn too_many_lines() { + println!("This is bad."); + println!("This is bad."); +} + +// This should be considered one line. +fn comment_starts_after_code() { + let _ = 5; /* closing comment. */ /* + this line shouldn't be counted theoretically. + */ +} + +// This should be considered one line. +fn comment_after_code() { + let _ = 5; /* this line should get counted once. */ +} + +// This should fail since it is technically two lines. +fn comment_before_code() { + let _ = "test"; + /* This comment extends to the front of + teh code but this line should still count. */ let _ = 5; +} + +// This should be considered one line. +fn main() {} diff --git a/tests/ui-toml/functions_maxlines/test.stderr b/tests/ui-toml/functions_maxlines/test.stderr new file mode 100644 index 00000000000..f36c5978784 --- /dev/null +++ b/tests/ui-toml/functions_maxlines/test.stderr @@ -0,0 +1,23 @@ +error: This function has a large number of lines. + --> $DIR/test.rs:19:1 + | +LL | / fn too_many_lines() { +LL | | println!("This is bad."); +LL | | println!("This is bad."); +LL | | } + | |_^ + | + = note: `-D clippy::too-many-lines` implied by `-D warnings` + +error: This function has a large number of lines. + --> $DIR/test.rs:37:1 + | +LL | / fn comment_before_code() { +LL | | let _ = "test"; +LL | | /* This comment extends to the front of +LL | | teh code but this line should still count. */ let _ = 5; +LL | | } + | |_^ + +error: aborting due to 2 previous errors + diff --git a/tests/ui/functions_maxlines.rs b/tests/ui/functions_maxlines.rs deleted file mode 100644 index 5f93f815340..00000000000 --- a/tests/ui/functions_maxlines.rs +++ /dev/null @@ -1,162 +0,0 @@ -#![warn(clippy::all, clippy::pedantic)] - -// TOO_MANY_LINES -fn good_lines() { - /* println!("This is good."); */ - // println!("This is good."); - /* */ // println!("This is good."); - /* */ // println!("This is good."); - /* */ // println!("This is good."); - /* */ // println!("This is good."); - /* println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); */ - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); - println!("This is good."); -} - -fn bad_lines() { - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); - println!("This is bad."); -} - -fn main() {} diff --git a/tests/ui/functions_maxlines.stderr b/tests/ui/functions_maxlines.stderr deleted file mode 100644 index 9e1b2fe568a..00000000000 --- a/tests/ui/functions_maxlines.stderr +++ /dev/null @@ -1,16 +0,0 @@ -error: This function has a large number of lines. - --> $DIR/functions_maxlines.rs:59:1 - | -LL | / fn bad_lines() { -LL | | println!("This is bad."); -LL | | println!("This is bad."); -LL | | println!("This is bad."); -... | -LL | | println!("This is bad."); -LL | | } - | |_^ - | - = note: `-D clippy::too-many-lines` implied by `-D warnings` - -error: aborting due to previous error -