Update to latest Cargo

Xanewok · Xanewok · commit 88a58d1f484a · 2021-01-15T01:47:18.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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 = "43cf77395cad5b79887b20b7cf19d418bbd703a9" }
+cargo = { git = "https://github.com/rust-lang/cargo", rev = "329895f5b52a358e5d9ecb26215708b5cb31d906" }
 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/rls/src/project_model.rs b/rls/src/project_model.rs
@@ -91,6 +91,9 @@ impl ProjectModel {
                 edition: match cargo_pkg.manifest().edition() {
                     cargo::core::Edition::Edition2015 => racer::Edition::Ed2015,
                     cargo::core::Edition::Edition2018 => racer::Edition::Ed2018,
+                    // FIXME: Use Racer's Ed2021 once
+                    // https://github.com/racer-rust/racer/pull/1152 is published.
+                    cargo::core::Edition::Edition2021 => racer::Edition::Ed2018,
                 },
             });
             manifest_to_id.insert(manifest, pkg);
