Skip to content

Commit

Permalink
Auto merge of rust-lang#119552 - krtab:dead_code_priv_mod_pub_field, …
Browse files Browse the repository at this point in the history
…r=cjgillot,saethlin

Replace visibility test with reachability test in dead code detection

Fixes rust-lang#119545

Also included is a fix for an error now flagged by the lint
  • Loading branch information
bors committed Mar 23, 2024
2 parents 02e11b9 + cbbb0ae commit e5ece90
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 2 deletions.
6 changes: 4 additions & 2 deletions clippy_lints/src/raw_strings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ impl EarlyLintPass for RawStrings {
}
}

let req = {
let mut req = {
let mut following_quote = false;
let mut req = 0;
// `once` so a raw string ending in hashes is still checked
Expand Down Expand Up @@ -136,7 +136,9 @@ impl EarlyLintPass for RawStrings {
ControlFlow::Continue(num) | ControlFlow::Break(num) => num,
}
};

if self.allow_one_hash_in_raw_strings {
req = req.max(1);
}
if req < max {
span_lint_and_then(
cx,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
allow-one-hash-in-raw-strings = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#![allow(clippy::no_effect, unused)]
#![warn(clippy::needless_raw_string_hashes)]

fn main() {
r#"\aaa"#;
r#"\aaa"#;
r#"Hello "world"!"#;
r####" "### "## "# "####;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#![allow(clippy::no_effect, unused)]
#![warn(clippy::needless_raw_string_hashes)]

fn main() {
r#"\aaa"#;
r##"\aaa"##;
r##"Hello "world"!"##;
r######" "### "## "# "######;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
error: unnecessary hashes around raw string literal
--> tests/ui-toml/needless_raw_string_hashes_one_allowed/needless_raw_string_hashes.rs:6:5
|
LL | r##"\aaa"##;
| ^^^^^^^^^^^
|
= note: `-D clippy::needless-raw-string-hashes` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::needless_raw_string_hashes)]`
help: remove one hash from both sides of the string literal
|
LL - r##"\aaa"##;
LL + r#"\aaa"#;
|

error: unnecessary hashes around raw string literal
--> tests/ui-toml/needless_raw_string_hashes_one_allowed/needless_raw_string_hashes.rs:7:5
|
LL | r##"Hello "world"!"##;
| ^^^^^^^^^^^^^^^^^^^^^
|
help: remove one hash from both sides of the string literal
|
LL - r##"Hello "world"!"##;
LL + r#"Hello "world"!"#;
|

error: unnecessary hashes around raw string literal
--> tests/ui-toml/needless_raw_string_hashes_one_allowed/needless_raw_string_hashes.rs:8:5
|
LL | r######" "### "## "# "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: remove 2 hashes from both sides of the string literal
|
LL - r######" "### "## "# "######;
LL + r####" "### "## "# "####;
|

error: aborting due to 3 previous errors

0 comments on commit e5ece90

Please sign in to comment.