OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix false positive in check mode caused by gen_deprecated

Browse Source 
`gen_deprecated` should never have created the string with linebreaks.

Using a single string broke the check because the changed lines were
different.
This commit is contained in:
Philipp Hansch 2018-11-04 22:05:12 +01:00
parent 90f31e21ab
commit f6194f33d2
No known key found for this signature in database
GPG Key ID: B6FA06A6E0E2665B
1 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
clippy_dev/src/lib.rs
View File

@ -114,19 +114,22 @@ pub fn gen_changelog_lint_list(lints: Vec<Lint>) -> Vec<String> {
/// Generates the `register_removed` code in `./clippy_lints/src/lib.rs`. /// Generates the `register_removed` code in `./clippy_lints/src/lib.rs`.
pub fn gen_deprecated(lints: &[Lint]) -> Vec<String> { pub fn gen_deprecated(lints: &[Lint]) -> Vec<String> {
lints.iter() itertools::flatten(
.filter_map(|l| { lints
l.clone().deprecation.and_then(|depr_text| { .iter()
Some( .filter_map(|l| {
format!( l.clone().deprecation.and_then(|depr_text| {
" store.register_removed(\n \"{}\",\n \"{}\",\n );", Some(
l.name, vec![
depr_text " store.register_removed(".to_string(),
format!(" \"{}\",", l.name),
format!(" \"{}\",", depr_text),
" );".to_string()
]
) )
) })
}) })
}) ).collect()
.collect()
} }
/// Gathers all files in `src/clippy_lints` and gathers all lints inside /// Gathers all files in `src/clippy_lints` and gathers all lints inside
@ -258,6 +261,7 @@ pub fn replace_region_in_text<F>(text: &str, start: &str, end: &str, replace_sta
// is incorrect. // is incorrect.
eprintln!("error: regex `{:?}` not found. You may have to update it.", start); eprintln!("error: regex `{:?}` not found. You may have to update it.", start);
} }
FileChange { FileChange {
changed: lines.ne(new_lines.clone()), changed: lines.ne(new_lines.clone()),
new_lines: new_lines.join("\n") new_lines: new_lines.join("\n")
@ -305,38 +309,40 @@ declare_deprecated_lint! {
#[test] #[test]
fn test_replace_region() { fn test_replace_region() {
let text = r#" let text = "\nabc\n123\n789\ndef\nghi";
abc let expected = FileChange {
123 changed: true,
789 new_lines: "\nabc\nhello world\ndef\nghi".to_string()
def };
ghi"#;
let expected = r#"
abc
hello world
def
ghi"#;
let result = replace_region_in_text(text, r#"^\s*abc$"#, r#"^\s*def"#, false, || { let result = replace_region_in_text(text, r#"^\s*abc$"#, r#"^\s*def"#, false, || {
vec!["hello world".to_string()] vec!["hello world".to_string()]
}).new_lines; });
assert_eq!(expected, result); assert_eq!(expected, result);
} }
#[test] #[test]
fn test_replace_region_with_start() { fn test_replace_region_with_start() {
let text = r#" let text = "\nabc\n123\n789\ndef\nghi";
abc let expected = FileChange {
123 changed: true,
789 new_lines: "\nhello world\ndef\nghi".to_string()
def };
ghi"#;
let expected = r#"
hello world
def
ghi"#;
let result = replace_region_in_text(text, r#"^\s*abc$"#, r#"^\s*def"#, true, || { let result = replace_region_in_text(text, r#"^\s*abc$"#, r#"^\s*def"#, true, || {
vec!["hello world".to_string()] vec!["hello world".to_string()]
}).new_lines; });
assert_eq!(expected, result);
}
#[test]
fn test_replace_region_no_changes() {
let text = "123\n456\n789";
let expected = FileChange {
changed: false,
new_lines: "123\n456\n789".to_string()
};
let result = replace_region_in_text(text, r#"^\s*123$"#, r#"^\s*456"#, false, || {
vec![]
});
assert_eq!(expected, result); assert_eq!(expected, result);
} }
@ -390,14 +396,19 @@ fn test_gen_changelog_lint_list() {
fn test_gen_deprecated() { fn test_gen_deprecated() {
let lints = vec![ let lints = vec![
Lint::new("should_assert_eq", "group1", "abc", Some("has been superseeded by should_assert_eq2"), "module_name"), Lint::new("should_assert_eq", "group1", "abc", Some("has been superseeded by should_assert_eq2"), "module_name"),
Lint::new("another_deprecated", "group2", "abc", Some("will be removed"), "module_name"),
Lint::new("should_assert_eq2", "group2", "abc", None, "module_name") Lint::new("should_assert_eq2", "group2", "abc", None, "module_name")
]; ];
let expected: Vec<String> = vec![ let expected: Vec<String> = vec![
r#" store.register_removed( " store.register_removed(",
"should_assert_eq", " \"should_assert_eq\",",
"has been superseeded by should_assert_eq2", " \"has been superseeded by should_assert_eq2\",",
);"#.to_string() " );",
]; " store.register_removed(",
" \"another_deprecated\",",
" \"will be removed\",",
" );"
].into_iter().map(String::from).collect();
assert_eq!(expected, gen_deprecated(&lints)); assert_eq!(expected, gen_deprecated(&lints));
} }