Rebase attempt to resolve merge conflict

Author: Ruster-a11y

src/test/ui/span/issue-39018.rs

@@ -26,7 +26,7 @@ fn foo() {
     let _ = &a + &b; //~ ERROR binary operation
     let _ = &a + b; //~ ERROR binary operation
     let _ = a + &b; // ok
-    let _ = a + b; //~ ERROR mismatched types
+    let _ = a + b; //~ ERROR E0277
     let _ = e + b; //~ ERROR binary operation
     let _ = e + &b; //~ ERROR binary operation
     let _ = e + d; //~ ERROR binary operation

src/test/ui/span/issue-39018.stderr

@@ -64,14 +64,20 @@ help: `to_owned()` can be used to create an owned `String` from a string referen
 LL |     let _ = a + &b;
    |             ^   ^^
 
-error[E0308]: mismatched types
-  --> $DIR/issue-39018.rs:29:17
+error[E0277]: cannot add `std::string::String` to `std::string::String`
+  --> $DIR/issue-39018.rs:29:15
    |
 LL |     let _ = a + b;
+<<<<<<< HEAD
    |                 ^
    |                 |
    |                 expected `&str`, found struct `std::string::String`
    |                 help: consider borrowing here: `&b`
+=======
+   |               ^ no implementation for `std::string::String + std::string::String`
+   |
+   = help: the trait `std::ops::Add` is not implemented for `std::string::String`
+>>>>>>> e6695f0a886... Edited src/test/ui/span/issue-39018.rs with the error code/string that compiler now produces.
 
 error[E0369]: binary operation `+` cannot be applied to type `&std::string::String`
   --> $DIR/issue-39018.rs:30:15