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

Update cargo.

Another small API change.

Author: bors

Cargo.lock

@@ -30,7 +30,7 @@ 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 = "e02974078a692d7484f510eaec0e88d1b6cc0203" }
+cargo = { git = "https://github.com/rust-lang/cargo", rev = "e57bd02999c9f40d52116e0beca7d1dccb0643de" }
 cargo_metadata = "0.8"
 clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "05b46034ea734f2b4436b700452771652ecc0074", optional = true }
 env_logger = "0.7"

Cargo.toml

@@ -215,5 +215,5 @@ fn resolve_with_prev<'cfg>(
     ws: &Workspace<'cfg>,
     prev: Option<&Resolve>,
 ) -> CargoResult<Resolve> {
-    ops::resolve_with_previous(registry, ws, ResolveOpts::everything(), prev, None, &[], true)
+    ops::resolve_with_previous(registry, ws, &ResolveOpts::everything(), prev, None, &[], true)
 }