Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Bump cargo version #1767

Merged
merged 1 commit into from
Mar 7, 2022
Merged

Bump cargo version #1767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,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 = "1c034752de0df744fcd7788fcbca158830b8bf85" }
cargo-util = { git = "https://github.com/rust-lang/cargo", rev = "1c034752de0df744fcd7788fcbca158830b8bf85" }
cargo = { git = "https://github.com/rust-lang/cargo", rev = "d6cdde584a1f15ea086bae922e20fd27f7165431" }
cargo-util = { git = "https://github.com/rust-lang/cargo", rev = "d6cdde584a1f15ea086bae922e20fd27f7165431" }
cargo_metadata = "0.14"
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", version = "0.1.60", optional = true }
env_logger = "0.9"
Expand All @@ -58,7 +58,7 @@ regex = "1"
ordslice = "0.3"
crossbeam-channel = "0.5"
toml = "0.5"
toml_edit = { version = "0.13.1", features = ["easy"] }
toml_edit = { version = "0.13.4", features = ["easy"] }
heck = "0.3"

# A noop dependency that changes in the Rust repository, it's a bit of a hack.
Expand Down
10 changes: 7 additions & 3 deletions rls/src/project_model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ use cargo::{
PackageId, Workspace,
},
ops,
util::{errors::CargoResult, important_paths::find_root_manifest_for_wd, toml},
util::{
errors::CargoResult, important_paths::find_root_manifest_for_wd, interning::InternedString,
toml,
},
Config,
};
use log::warn;
Expand Down Expand Up @@ -36,7 +39,7 @@ struct PackageData {

#[derive(Debug)]
pub struct Dep {
pub crate_name: String,
pub crate_name: InternedString,
pub pkg: Package,
}

Expand Down Expand Up @@ -103,7 +106,8 @@ impl ProjectModel {
let pkg = cargo_packages.get_one(dep_id)?;
let lib = pkg.targets().iter().find(|t| t.is_lib());
if let Some(lib) = lib {
let crate_name = resolve.extern_crate_name(pkg_id, dep_id, &lib)?;
let (crate_name, _) =
resolve.extern_crate_name_and_dep_name(pkg_id, dep_id, &lib)?;
packages[pkg_id_to_pkg[&pkg_id].0]
.deps
.push(Dep { crate_name, pkg: pkg_id_to_pkg[&dep_id] })
Expand Down