Auto merge of #1728 - ehuss:update-cargo, r=Xanewok

bors · bors · commit c7a19f64b02f · 2021-04-21T10:00:40.000Z
Update cargo

The wording of an error message changed slightly, so a test needs to be updated.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,8 +30,8 @@ rls-vfs = "0.8"
 rls-ipc = { version = "0.1.0", path = "rls-ipc", optional = true }
 
 anyhow = "1.0.26"
-cargo = { git = "https://github.com/rust-lang/cargo", rev = "58a961314437258065e23cb6316dfc121d96fb71" }
-cargo-util = { git = "https://github.com/rust-lang/cargo", rev = "58a961314437258065e23cb6316dfc121d96fb71" }
+cargo = { git = "https://github.com/rust-lang/cargo", rev = "8dd533662007374412f460b4e442d3f8c193bff9" }
+cargo-util = { git = "https://github.com/rust-lang/cargo", rev = "8dd533662007374412f460b4e442d3f8c193bff9" }
 cargo_metadata = "0.8"
 clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "7ea7cd165ad6705603852771bf82cc2fd6560db5", optional = true }
 env_logger = "0.7"
diff --git a/tests/client.rs b/tests/client.rs
@@ -813,7 +813,7 @@ fn client_invalid_member_toml_manifest() {
 
     assert_eq!(diag.diagnostics.len(), 1);
     assert_eq!(diag.diagnostics[0].severity, Some(DiagnosticSeverity::Error));
-    assert!(diag.diagnostics[0].message.contains("failed to read"));
+    assert!(diag.diagnostics[0].message.contains("failed to load manifest"));
 }
 
 #[test]

Original file line number	Diff line number	Diff line change
`@@ -813,7 +813,7 @@ fn client_invalid_member_toml_manifest() {`
`813`	`813`
`814`	`814`	`assert_eq!(diag.diagnostics.len(), 1);`
`815`	`815`	`assert_eq!(diag.diagnostics[0].severity, Some(DiagnosticSeverity::Error));`
`816`		`- assert!(diag.diagnostics[0].message.contains("failed to read"));`
	`816`	`+ assert!(diag.diagnostics[0].message.contains("failed to load manifest"));`
`817`	`817`	`}`
`818`	`818`
`819`	`819`	`#[test]`