fix: extra semicolon, only create callsite once

Author: yaahc

clippy_lints/src/strings.rs

@@ -161,7 +161,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for StringLitAsBytes {
             if path.ident.name == "as_bytes" {
                 if let ExprKind::Lit(ref lit) = args[0].node {
                     if let LitKind::Str(ref lit_content, _) = lit.node {
-                        let callsite = snippet(cx, args[0].span.source_callsite(), "");
+                        let callsite = snippet(cx, args[0].span.source_callsite(), r#""foo""#);
                         let expanded = format!("\"{}\"", lit_content.as_str());
                         if callsite.starts_with("include_str!") {
                             span_lint_and_sugg(

tests/ui/strings.rs

@@ -49,6 +49,8 @@ fn both() {
 fn str_lit_as_bytes() {
     let bs = "hello there".as_bytes();
 
+    let bs = r###"raw string with three ### in it and some " ""###.as_bytes();
+
     // no warning, because this cannot be written as a byte string literal:
     let ubs = "☃".as_bytes();
 
@@ -57,13 +59,14 @@ fn str_lit_as_bytes() {
     let includestr = include_str!("entry.rs").as_bytes();
 }
 
+#[allow(clippy::assign_op_pattern)]
 fn main() {
     add_only();
     add_assign_only();
     both();
 
     // the add is only caught for `String`
     let mut x = 1;
-;    x = x + 1;
+    x = x + 1;
     assert_eq!(2, x);
 }

tests/ui/strings.stderr

@@ -61,16 +61,10 @@ error: calling `as_bytes()` on a string literal
    = note: `-D clippy::string-lit-as-bytes` implied by `-D warnings`
 
 error: calling `as_bytes()` on `include_str!(..)`
-  --> $DIR/strings.rs:57:22
+  --> $DIR/strings.rs:59:22
    |
-57 |     let includestr = include_str!("entry.rs").as_bytes();
+59 |     let includestr = include_str!("entry.rs").as_bytes();
    |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `include_bytes!(..)` instead: `include_bytes!("entry.rs")`
 
-error: manual implementation of an assign operation
-  --> $DIR/strings.rs:67:6
-   |
-67 | ;    x = x + 1;
-   |      ^^^^^^^^^ help: replace it with: `x += 1`
-
-error: aborting due to 11 previous errors
+error: aborting due to 10 previous errors