diff --git a/Cargo.lock b/Cargo.lock index bb30916562..f8562328c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -152,8 +152,8 @@ checksum = "81a18687293a1546b67c246452202bbbf143d239cb43494cc163da14979082da" [[package]] name = "cargo" -version = "0.53.0" -source = "git+https://github.com/rust-lang/cargo?rev=58a961314437258065e23cb6316dfc121d96fb71#58a961314437258065e23cb6316dfc121d96fb71" +version = "0.54.0" +source = "git+https://github.com/rust-lang/cargo?rev=8dd533662007374412f460b4e442d3f8c193bff9#8dd533662007374412f460b4e442d3f8c193bff9" dependencies = [ "anyhow", "atty", @@ -194,6 +194,7 @@ dependencies = [ "serde", "serde_ignored", "serde_json", + "shell-escape", "strip-ansi-escapes", "tar", "tempfile", @@ -209,7 +210,7 @@ dependencies = [ [[package]] name = "cargo-platform" version = "0.1.1" -source = "git+https://github.com/rust-lang/cargo?rev=58a961314437258065e23cb6316dfc121d96fb71#58a961314437258065e23cb6316dfc121d96fb71" +source = "git+https://github.com/rust-lang/cargo?rev=8dd533662007374412f460b4e442d3f8c193bff9#8dd533662007374412f460b4e442d3f8c193bff9" dependencies = [ "serde", ] @@ -217,7 +218,7 @@ dependencies = [ [[package]] name = "cargo-util" version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo?rev=58a961314437258065e23cb6316dfc121d96fb71#58a961314437258065e23cb6316dfc121d96fb71" +source = "git+https://github.com/rust-lang/cargo?rev=8dd533662007374412f460b4e442d3f8c193bff9#8dd533662007374412f460b4e442d3f8c193bff9" dependencies = [ "anyhow", "core-foundation", @@ -392,7 +393,7 @@ checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" [[package]] name = "crates-io" version = "0.33.0" -source = "git+https://github.com/rust-lang/cargo?rev=58a961314437258065e23cb6316dfc121d96fb71#58a961314437258065e23cb6316dfc121d96fb71" +source = "git+https://github.com/rust-lang/cargo?rev=8dd533662007374412f460b4e442d3f8c193bff9#8dd533662007374412f460b4e442d3f8c193bff9" dependencies = [ "anyhow", "curl", diff --git a/Cargo.toml b/Cargo.toml index 3c103c3901..864674c9a5 100644 --- 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 index de7e9a26cb..67d2afc33a 100644 --- 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]