From e3a1555648f7e0471a4d1620e950644c2f725aa6 Mon Sep 17 00:00:00 2001
From: John Millikin <john@john-millikin.com>
Date: Wed, 1 Nov 2023 09:16:34 +0900
Subject: [PATCH] Stabilize C string literals
---
tests/ui/needless_raw_string.fixed | 1 -
tests/ui/needless_raw_string.rs | 1 -
tests/ui/needless_raw_string.stderr | 14 +++++-----
tests/ui/needless_raw_string_hashes.fixed | 1 -
tests/ui/needless_raw_string_hashes.rs | 1 -
tests/ui/needless_raw_string_hashes.stderr | 30 +++++++++++-----------
6 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/tests/ui/needless_raw_string.fixed b/tests/ui/needless_raw_string.fixed
index 4ea711fd67a..1a9c601c462 100644
--- a/tests/ui/needless_raw_string.fixed
+++ b/tests/ui/needless_raw_string.fixed
@@ -1,6 +1,5 @@
#![allow(clippy::needless_raw_string_hashes, clippy::no_effect, unused)]
#![warn(clippy::needless_raw_strings)]
-#![feature(c_str_literals)]
fn main() {
"aaa";
diff --git a/tests/ui/needless_raw_string.rs b/tests/ui/needless_raw_string.rs
index b6239f9b1f0..1126ea5aa30 100644
--- a/tests/ui/needless_raw_string.rs
+++ b/tests/ui/needless_raw_string.rs
@@ -1,6 +1,5 @@
#![allow(clippy::needless_raw_string_hashes, clippy::no_effect, unused)]
#![warn(clippy::needless_raw_strings)]
-#![feature(c_str_literals)]
fn main() {
r#"aaa"#;
diff --git a/tests/ui/needless_raw_string.stderr b/tests/ui/needless_raw_string.stderr
index 276bc84c6c3..b2188698564 100644
--- a/tests/ui/needless_raw_string.stderr
+++ b/tests/ui/needless_raw_string.stderr
@@ -1,5 +1,5 @@
error: unnecessary raw string literal
- --> $DIR/needless_raw_string.rs:6:5
+ --> $DIR/needless_raw_string.rs:5:5
|
LL | r#"aaa"#;
| ^^^^^^^^
@@ -13,7 +13,7 @@ LL + "aaa";
|
error: unnecessary raw string literal
- --> $DIR/needless_raw_string.rs:9:5
+ --> $DIR/needless_raw_string.rs:8:5
|
LL | br#"aaa"#;
| ^^^^^^^^^
@@ -25,7 +25,7 @@ LL + b"aaa";
|
error: unnecessary raw string literal
- --> $DIR/needless_raw_string.rs:12:5
+ --> $DIR/needless_raw_string.rs:11:5
|
LL | cr#"aaa"#;
| ^^^^^^^^^
@@ -37,7 +37,7 @@ LL + c"aaa";
|
error: unnecessary raw string literal
- --> $DIR/needless_raw_string.rs:16:5
+ --> $DIR/needless_raw_string.rs:15:5
|
LL | / r#"
LL | | a
@@ -56,7 +56,7 @@ LL ~ ";
|
error: unnecessary raw string literal
- --> $DIR/needless_raw_string.rs:22:5
+ --> $DIR/needless_raw_string.rs:21:5
|
LL | r"no hashes";
| ^^^^^^^^^^^^
@@ -68,7 +68,7 @@ LL + "no hashes";
|
error: unnecessary raw string literal
- --> $DIR/needless_raw_string.rs:23:5
+ --> $DIR/needless_raw_string.rs:22:5
|
LL | br"no hashes";
| ^^^^^^^^^^^^^
@@ -80,7 +80,7 @@ LL + b"no hashes";
|
error: unnecessary raw string literal
- --> $DIR/needless_raw_string.rs:24:5
+ --> $DIR/needless_raw_string.rs:23:5
|
LL | cr"no hashes";
| ^^^^^^^^^^^^^
diff --git a/tests/ui/needless_raw_string_hashes.fixed b/tests/ui/needless_raw_string_hashes.fixed
index c99c2f46532..b2ad657d6b2 100644
--- a/tests/ui/needless_raw_string_hashes.fixed
+++ b/tests/ui/needless_raw_string_hashes.fixed
@@ -1,6 +1,5 @@
#![allow(clippy::no_effect, unused)]
#![warn(clippy::needless_raw_string_hashes)]
-#![feature(c_str_literals)]
fn main() {
r"\aaa";
diff --git a/tests/ui/needless_raw_string_hashes.rs b/tests/ui/needless_raw_string_hashes.rs
index dcc2af69f4e..54d8ed76d47 100644
--- a/tests/ui/needless_raw_string_hashes.rs
+++ b/tests/ui/needless_raw_string_hashes.rs
@@ -1,6 +1,5 @@
#![allow(clippy::no_effect, unused)]
#![warn(clippy::needless_raw_string_hashes)]
-#![feature(c_str_literals)]
fn main() {
r#"\aaa"#;
diff --git a/tests/ui/needless_raw_string_hashes.stderr b/tests/ui/needless_raw_string_hashes.stderr
index 017160b1a42..c74eff8161e 100644
--- a/tests/ui/needless_raw_string_hashes.stderr
+++ b/tests/ui/needless_raw_string_hashes.stderr
@@ -1,5 +1,5 @@
error: unnecessary hashes around raw string literal
- --> $DIR/needless_raw_string_hashes.rs:6:5
+ --> $DIR/needless_raw_string_hashes.rs:5:5
|
LL | r#"\aaa"#;
| ^^^^^^^^^
@@ -13,7 +13,7 @@ LL + r"\aaa";
|
error: unnecessary hashes around raw string literal
- --> $DIR/needless_raw_string_hashes.rs:7:5
+ --> $DIR/needless_raw_string_hashes.rs:6:5
|
LL | r##"Hello "world"!"##;
| ^^^^^^^^^^^^^^^^^^^^^
@@ -25,7 +25,7 @@ LL + r#"Hello "world"!"#;
|
error: unnecessary hashes around raw string literal
- --> $DIR/needless_raw_string_hashes.rs:8:5
+ --> $DIR/needless_raw_string_hashes.rs:7:5
|
LL | r######" "### "## "# "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -37,7 +37,7 @@ LL + r####" "### "## "# "####;
|
error: unnecessary hashes around raw string literal
- --> $DIR/needless_raw_string_hashes.rs:9:5
+ --> $DIR/needless_raw_string_hashes.rs:8:5
|
LL | r######" "aa" "# "## "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -49,7 +49,7 @@ LL + r###" "aa" "# "## "###;
|
error: unnecessary hashes around raw string literal
- --> $DIR/needless_raw_string_hashes.rs:10:5
+ --> $DIR/needless_raw_string_hashes.rs:9:5
|
LL | br#"\aaa"#;
| ^^^^^^^^^^
@@ -61,7 +61,7 @@ LL + br"\aaa";
|
error: unnecessary hashes around raw string literal
- --> $DIR/needless_raw_string_hashes.rs:11:5
+ --> $DIR/needless_raw_string_hashes.rs:10:5
|
LL | br##"Hello "world"!"##;
| ^^^^^^^^^^^^^^^^^^^^^^
@@ -73,7 +73,7 @@ LL + br#"Hello "world"!"#;
|
error: unnecessary hashes around raw string literal
- --> $DIR/needless_raw_string_hashes.rs:12:5
+ --> $DIR/needless_raw_string_hashes.rs:11:5
|
LL | br######" "### "## "# "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -85,7 +85,7 @@ LL + br####" "### "## "# "####;
|
error: unnecessary hashes around raw string literal
- --> $DIR/needless_raw_string_hashes.rs:13:5
+ --> $DIR/needless_raw_string_hashes.rs:12:5
|
LL | br######" "aa" "# "## "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -97,7 +97,7 @@ LL + br###" "aa" "# "## "###;
|
error: unnecessary hashes around raw string literal
- --> $DIR/needless_raw_string_hashes.rs:14:5
+ --> $DIR/needless_raw_string_hashes.rs:13:5
|
LL | cr#"\aaa"#;
| ^^^^^^^^^^
@@ -109,7 +109,7 @@ LL + cr"\aaa";
|
error: unnecessary hashes around raw string literal
- --> $DIR/needless_raw_string_hashes.rs:15:5
+ --> $DIR/needless_raw_string_hashes.rs:14:5
|
LL | cr##"Hello "world"!"##;
| ^^^^^^^^^^^^^^^^^^^^^^
@@ -121,7 +121,7 @@ LL + cr#"Hello "world"!"#;
|
error: unnecessary hashes around raw string literal
- --> $DIR/needless_raw_string_hashes.rs:16:5
+ --> $DIR/needless_raw_string_hashes.rs:15:5
|
LL | cr######" "### "## "# "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -133,7 +133,7 @@ LL + cr####" "### "## "# "####;
|
error: unnecessary hashes around raw string literal
- --> $DIR/needless_raw_string_hashes.rs:17:5
+ --> $DIR/needless_raw_string_hashes.rs:16:5
|
LL | cr######" "aa" "# "## "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -145,7 +145,7 @@ LL + cr###" "aa" "# "## "###;
|
error: unnecessary hashes around raw string literal
- --> $DIR/needless_raw_string_hashes.rs:19:5
+ --> $DIR/needless_raw_string_hashes.rs:18:5
|
LL | / r#"
LL | | \a
@@ -164,7 +164,7 @@ LL ~ ";
|
error: unnecessary hashes around raw string literal
- --> $DIR/needless_raw_string_hashes.rs:25:5
+ --> $DIR/needless_raw_string_hashes.rs:24:5
|
LL | r###"rust"###;
| ^^^^^^^^^^^^^
@@ -176,7 +176,7 @@ LL + r"rust";
|
error: unnecessary hashes around raw string literal
- --> $DIR/needless_raw_string_hashes.rs:26:5
+ --> $DIR/needless_raw_string_hashes.rs:25:5
|
LL | r#"hello world"#;
| ^^^^^^^^^^^^^^^^