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

Update cargo. #1562

Merged
merged 1 commit into from
Oct 1, 2019
Merged

Update cargo. #1562

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
92 changes: 54 additions & 38 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.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ rls-span = "0.5"
rls-vfs = "0.8"
rls-ipc = { version = "0.1.0", path = "rls-ipc", optional = true }

cargo = { git = "https://github.com/rust-lang/cargo", rev = "cdf7f6380a7a23a5bffc26ab35fc434200f30ad6" }
cargo = { git = "https://github.com/rust-lang/cargo", rev = "8b0561d68f12eeb1d72e07ceef464ebf6032a1bc" }
cargo_metadata = "0.8"
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "72da1015d6d918fe1b29170acbf486d30e0c2695", optional = true }
env_logger = "0.6"
Expand Down
4 changes: 2 additions & 2 deletions rls/src/build/cargo_plan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use std::fmt;
use std::path::{Path, PathBuf};
use std::sync::Mutex;

use cargo::core::compiler::{CompileMode, Context, Kind, Unit};
use cargo::core::compiler::{CompileKind, CompileMode, Context, Unit};
use cargo::core::profiles::Profile;
use cargo::core::{PackageId, Target, TargetKind};
use cargo::util::ProcessBuilder;
Expand Down Expand Up @@ -477,7 +477,7 @@ pub(crate) struct OwnedUnit {
pub(crate) id: PackageId,
pub(crate) target: Target,
pub(crate) profile: Profile,
pub(crate) kind: Kind,
pub(crate) kind: CompileKind,
pub(crate) mode: CompileMode,
}

Expand Down