fix typos, adjust suggestion, add description

rust-lang · Dec 3, 2023 · 6e25e10 · 6e25e10
1 parent a4a0894
commit 6e25e10
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/clippy_lints/src/methods/manual_c_str_literals.rs b/clippy_lints/src/methods/manual_c_str_literals.rs
@@ -44,7 +44,7 @@ fn check_from_ptr(cx: &LateContext<'_>, expr: &Expr<'_>, arg: &Expr<'_>) {
             MANUAL_C_STR_LITERALS,
             expr.span,
             "calling `CStr::from_ptr` with a byte string literal",
-            "use a c-str literal",
+            r#"use a `c""` literal"#,
             rewrite_as_cstr(cx, lit.span),
             Applicability::MachineApplicable,
         );
@@ -71,7 +71,7 @@ fn check_from_bytes(cx: &LateContext<'_>, expr: &Expr<'_>, arg: &Expr<'_>, metho
         MANUAL_C_STR_LITERALS,
         span,
         "calling `CStr::new` with a byte string literal",
-        "use a c-str literal",
+        r#"use a `c""` literal"#,
         rewrite_as_cstr(cx, arg.span),
         applicability,
     );

diff --git a/clippy_lints/src/methods/mod.rs b/clippy_lints/src/methods/mod.rs
@@ -3755,7 +3755,7 @@ declare_clippy_lint! {
 
 declare_clippy_lint! {
     /// ### What it does
-    /// Checks for calls to `CString::new` and `CStr::from_bytes_with_nul` with byte string literals as arguments.
+    /// Checks for calls to `CString::from_ptr` and `CStr::from_bytes_with_nul` with byte string literals as arguments.
     ///
     /// ### Why is this bad?
     /// This can be written more concisely using `c"str"` literals and is also less error-prone,
@@ -3776,7 +3776,7 @@ declare_clippy_lint! {
     #[clippy::version = "1.76.0"]
     pub MANUAL_C_STR_LITERALS,
     pedantic,
-    "default lint description"
+    r#"creating a `CStr` through functions when `c""` literals can be used"#
 }
 
 pub struct Methods {

diff --git a/tests/ui/manual_c_str_literals.stderr b/tests/ui/manual_c_str_literals.stderr
@@ -2,7 +2,7 @@ error: calling `CStr::new` with a byte string literal
   --> $DIR/manual_c_str_literals.rs:32:5
    |
 LL |     CStr::from_bytes_with_nul(b"foo\0");
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a c-str literal: `c"foo"`
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a `c""` literal: `c"foo"`
    |
    = note: `-D clippy::manual-c-str-literals` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::manual_c_str_literals)]`
@@ -11,37 +11,37 @@ error: calling `CStr::new` with a byte string literal
   --> $DIR/manual_c_str_literals.rs:36:5
    |
 LL |     CStr::from_bytes_with_nul(b"foo\0");
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a c-str literal: `c"foo"`
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a `c""` literal: `c"foo"`
 
 error: calling `CStr::new` with a byte string literal
   --> $DIR/manual_c_str_literals.rs:37:5
    |
 LL |     CStr::from_bytes_with_nul(b"foo\x00");
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a c-str literal: `c"foo"`
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a `c""` literal: `c"foo"`
 
 error: calling `CStr::new` with a byte string literal
   --> $DIR/manual_c_str_literals.rs:38:5
    |
 LL |     CStr::from_bytes_with_nul(b"foo\0").unwrap();
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a c-str literal: `c"foo"`
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a `c""` literal: `c"foo"`
 
 error: calling `CStr::new` with a byte string literal
   --> $DIR/manual_c_str_literals.rs:39:5
    |
 LL |     CStr::from_bytes_with_nul(b"foo\\0sdsd\0").unwrap();
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a c-str literal: `c"foo\\0sdsd"`
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a `c""` literal: `c"foo\\0sdsd"`
 
 error: calling `CStr::from_ptr` with a byte string literal
   --> $DIR/manual_c_str_literals.rs:44:14
    |
 LL |     unsafe { CStr::from_ptr(b"foo\0".as_ptr().cast()) };
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a c-str literal: `c"foo"`
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a `c""` literal: `c"foo"`
 
 error: calling `CStr::from_ptr` with a byte string literal
   --> $DIR/manual_c_str_literals.rs:45:14
    |
 LL |     unsafe { CStr::from_ptr(b"foo\0".as_ptr() as *const _) };
-   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a c-str literal: `c"foo"`
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use a `c""` literal: `c"foo"`
 
 error: aborting due to 7 previous errors