Merge commit '27f4044df03d15c7c38a483c3e4635cf4f51807d'

This merges this commit into RLS master; it was pulled into rust-lang/rust by
mistake in rust-lang/rust#97853 before it was merged
into rust-lang/rls master branch. The commit in its raw form is persisted on
rust-lang/rls by way of a new branch
(retain-for-rustc-3d829a0922d865d7a77fb284424fd8ba6afaea3b), and after being
merged into master we will bump rust-lang/rust to the latest version of
rust-lang/rls master.

Author: Mark-Simulacrum

tests/client.rs

@@ -45,7 +45,7 @@ fn client_test_infer_bin() {
     let diag = rls.wait_for_diagnostics();
 
     assert!(diag.uri.as_str().ends_with("src/main.rs"));
-    assert!(diag.diagnostics[0].message.contains("struct is never constructed: `UnusedBin`"));
+    assert!(diag.diagnostics[0].message.contains("struct `UnusedBin` is never constructed"));
 }
 
 #[test]
@@ -59,7 +59,7 @@ fn client_test_infer_lib() {
     let diag = rls.wait_for_diagnostics();
 
     assert!(diag.uri.as_str().ends_with("src/lib.rs"));
-    assert!(diag.diagnostics[0].message.contains("struct is never constructed: `UnusedLib`"));
+    assert!(diag.diagnostics[0].message.contains("struct `UnusedLib` is never constructed"));
 }
 
 #[test]
@@ -74,7 +74,7 @@ fn client_test_infer_custom_bin() {
     let diag = rls.wait_for_diagnostics();
 
     assert!(diag.uri.as_str().ends_with("src/custom_bin.rs"));
-    assert!(diag.diagnostics[0].message.contains("struct is never constructed: `UnusedCustomBin`"));
+    assert!(diag.diagnostics[0].message.contains("struct `UnusedCustomBin` is never constructed"));
 }
 
 /// Test includes window/progress regression testing
@@ -1979,7 +1979,7 @@ fn client_infer_lib() {
     assert!(diag.uri.as_str().ends_with("src/lib.rs"));
     assert_eq!(diag.diagnostics.len(), 1);
     assert_eq!(diag.diagnostics[0].severity, Some(DiagnosticSeverity::Warning));
-    assert!(diag.diagnostics[0].message.contains("struct is never constructed: `UnusedLib`"));
+    assert!(diag.diagnostics[0].message.contains("struct `UnusedLib` is never constructed"));
 }
 
 #[test]