user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #11416 - Alexendoo:raw-strings-multipart, r=xFrednet

Browse source 
Use multipart suggestions for raw string lints

Should make it slightly easier to see the suggested edit

Before/after for `needless_raw_string_hashes`:

| Before| After |
|--------|--------|
| ![before](https://github.com/rust-lang/rust-clippy/assets/1830331/da52a436-d890-4594-9191-819c1af946c7) | ![after](https://github.com/rust-lang/rust-clippy/assets/1830331/9731d790-8efa-42a2-b2e9-0ec51398f8f3) |

changelog: none
This commit is contained in:
bors 2023-09-01 22:19:57 +00:00
commit a8b5245ea3
8 changed files with 289 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/ui/needless_raw_string.fixed
View file

@ -9,8 +9,13 @@ fn main() {
b"aaa";
br#""aaa""#;
br#"\s"#;
// currently disabled: https://github.com/rust-lang/rust/issues/113333
// cr#"aaa"#;
// cr#""aaa""#;
// cr#"\s"#;
c"aaa";
cr#""aaa""#;
cr#"\s"#;
"
a
multiline
string
";
}

13
tests/ui/needless_raw_string.rs
View file

@ -9,8 +9,13 @@ fn main() {
br#"aaa"#;
br#""aaa""#;
br#"\s"#;
// currently disabled: https://github.com/rust-lang/rust/issues/113333
// cr#"aaa"#;
// cr#""aaa""#;
// cr#"\s"#;
cr#"aaa"#;
cr#""aaa""#;
cr#"\s"#;
r#"
a
multiline
string
"#;
}

48
tests/ui/needless_raw_string.stderr
View file

@ -2,15 +2,57 @@ error: unnecessary raw string literal
--> $DIR/needless_raw_string.rs:6:5
|
LL | r#"aaa"#;
| ^^^^^^^^ help: try: `"aaa"`
| ^^^^^^^^
|
= note: `-D clippy::needless-raw-strings` implied by `-D warnings`
help: try
|
LL - r#"aaa"#;
LL + "aaa";
|
error: unnecessary raw string literal
--> $DIR/needless_raw_string.rs:9:5
|
LL | br#"aaa"#;
| ^^^^^^^^^ help: try: `b"aaa"`
| ^^^^^^^^^
|
help: try
|
LL - br#"aaa"#;
LL + b"aaa";
|
error: aborting due to 2 previous errors
error: unnecessary raw string literal
--> $DIR/needless_raw_string.rs:12:5
|
LL | cr#"aaa"#;
| ^^^^^^^^^
|
help: try
|
LL - cr#"aaa"#;
LL + c"aaa";
|
error: unnecessary raw string literal
--> $DIR/needless_raw_string.rs:16:5
|
LL | / r#"
LL | | a
LL | | multiline
LL | | string
LL | | "#;
| |______^
|
help: try
|
LL ~ "
LL | a
LL | multiline
LL | string
LL ~ ";
|
error: aborting due to 4 previous errors

19
tests/ui/needless_raw_string_hashes.fixed
View file

@ -3,17 +3,22 @@
#![feature(c_str_literals)]
fn main() {
r#"aaa"#;
r"\aaa";
r#"Hello "world"!"#;
r####" "### "## "# "####;
r###" "aa" "# "## "###;
br#"aaa"#;
br"\aaa";
br#"Hello "world"!"#;
br####" "### "## "# "####;
br###" "aa" "# "## "###;
// currently disabled: https://github.com/rust-lang/rust/issues/113333
// cr#"aaa"#;
// cr##"Hello "world"!"##;
// cr######" "### "## "# "######;
// cr######" "aa" "# "## "######;
cr"\aaa";
cr#"Hello "world"!"#;
cr####" "### "## "# "####;
cr###" "aa" "# "## "###;
r"
\a
multiline
string
";
}

19
tests/ui/needless_raw_string_hashes.rs
View file

@ -3,17 +3,22 @@
#![feature(c_str_literals)]
fn main() {
r#"aaa"#;
r#"\aaa"#;
r##"Hello "world"!"##;
r######" "### "## "# "######;
r######" "aa" "# "## "######;
br#"aaa"#;
br#"\aaa"#;
br##"Hello "world"!"##;
br######" "### "## "# "######;
br######" "aa" "# "## "######;
// currently disabled: https://github.com/rust-lang/rust/issues/113333
// cr#"aaa"#;
// cr##"Hello "world"!"##;
// cr######" "### "## "# "######;
// cr######" "aa" "# "## "######;
cr#"\aaa"#;
cr##"Hello "world"!"##;
cr######" "### "## "# "######;
cr######" "aa" "# "## "######;
r#"
\a
multiline
string
"#;
}

142
tests/ui/needless_raw_string_hashes.stderr
View file

@ -1,40 +1,166 @@
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:6:5
|
LL | r#"\aaa"#;
| ^^^^^^^^^
|
= note: `-D clippy::needless-raw-string-hashes` implied by `-D warnings`
help: remove all the hashes around the literal
|
LL - r#"\aaa"#;
LL + r"\aaa";
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:7:5
|
LL | r##"Hello "world"!"##;
| ^^^^^^^^^^^^^^^^^^^^^ help: try: `r#"Hello "world"!"#`
| ^^^^^^^^^^^^^^^^^^^^^
|
help: remove one hash from both sides of the literal
|
LL - r##"Hello "world"!"##;
LL + r#"Hello "world"!"#;
|
= note: `-D clippy::needless-raw-string-hashes` implied by `-D warnings`
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:8:5
|
LL | r######" "### "## "# "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `r####" "### "## "# "####`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: remove 2 hashes from both sides of the literal
|
LL - r######" "### "## "# "######;
LL + r####" "### "## "# "####;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:9:5
|
LL | r######" "aa" "# "## "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `r###" "aa" "# "## "###`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: remove 3 hashes from both sides of the literal
|
LL - r######" "aa" "# "## "######;
LL + r###" "aa" "# "## "###;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:10:5
|
LL | br#"\aaa"#;
| ^^^^^^^^^^
|
help: remove all the hashes around the literal
|
LL - br#"\aaa"#;
LL + br"\aaa";
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:11:5
|
LL | br##"Hello "world"!"##;
| ^^^^^^^^^^^^^^^^^^^^^^ help: try: `br#"Hello "world"!"#`
| ^^^^^^^^^^^^^^^^^^^^^^
|
help: remove one hash from both sides of the literal
|
LL - br##"Hello "world"!"##;
LL + br#"Hello "world"!"#;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:12:5
|
LL | br######" "### "## "# "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `br####" "### "## "# "####`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: remove 2 hashes from both sides of the literal
|
LL - br######" "### "## "# "######;
LL + br####" "### "## "# "####;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:13:5
|
LL | br######" "aa" "# "## "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `br###" "aa" "# "## "###`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: remove 3 hashes from both sides of the literal
|
LL - br######" "aa" "# "## "######;
LL + br###" "aa" "# "## "###;
|
error: aborting due to 6 previous errors
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:14:5
|
LL | cr#"\aaa"#;
| ^^^^^^^^^^
|
help: remove all the hashes around the literal
|
LL - cr#"\aaa"#;
LL + cr"\aaa";
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:15:5
|
LL | cr##"Hello "world"!"##;
| ^^^^^^^^^^^^^^^^^^^^^^
|
help: remove one hash from both sides of the literal
|
LL - cr##"Hello "world"!"##;
LL + cr#"Hello "world"!"#;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:16:5
|
LL | cr######" "### "## "# "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: remove 2 hashes from both sides of the literal
|
LL - cr######" "### "## "# "######;
LL + cr####" "### "## "# "####;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:17:5
|
LL | cr######" "aa" "# "## "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: remove 3 hashes from both sides of the literal
|
LL - cr######" "aa" "# "## "######;
LL + cr###" "aa" "# "## "###;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:19:5
|
LL | / r#"
LL | | \a
LL | | multiline
LL | | string
LL | | "#;
| |______^
|
help: remove all the hashes around the literal
|
LL ~ r"
LL | \a
LL | multiline
LL | string
LL ~ ";
|
error: aborting due to 13 previous errors

7
tests/ui/write_literal_2.stderr
View file

@ -2,9 +2,14 @@ error: unnecessary raw string literal
--> $DIR/write_literal_2.rs:13:24
|
LL | writeln!(v, r"{}", r"{hello}");
| ^^^^^^^^^^ help: try: `"{hello}"`
| ^^^^^^^^^^
|
= note: `-D clippy::needless-raw-strings` implied by `-D warnings`
help: try
|
LL - writeln!(v, r"{}", r"{hello}");
LL + writeln!(v, r"{}", "{hello}");
|
error: literal with an empty format string
--> $DIR/write_literal_2.rs:10:23