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

Commit 8dc9ba9

Browse files
authored
Merge pull request #1562 from ehuss/update-cargo
Update cargo.
2 parents 80a1d34 + 0737d9d commit 8dc9ba9

File tree

3 files changed

+57
-41
lines changed

3 files changed

+57
-41
lines changed

Cargo.lock

+54-38
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ rls-span = "0.5"
2929
rls-vfs = "0.8"
3030
rls-ipc = { version = "0.1.0", path = "rls-ipc", optional = true }
3131

32-
cargo = { git = "https://github.com/rust-lang/cargo", rev = "cdf7f6380a7a23a5bffc26ab35fc434200f30ad6" }
32+
cargo = { git = "https://github.com/rust-lang/cargo", rev = "8b0561d68f12eeb1d72e07ceef464ebf6032a1bc" }
3333
cargo_metadata = "0.8"
3434
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "72da1015d6d918fe1b29170acbf486d30e0c2695", optional = true }
3535
env_logger = "0.6"

rls/src/build/cargo_plan.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use std::fmt;
1919
use std::path::{Path, PathBuf};
2020
use std::sync::Mutex;
2121

22-
use cargo::core::compiler::{CompileMode, Context, Kind, Unit};
22+
use cargo::core::compiler::{CompileKind, CompileMode, Context, Unit};
2323
use cargo::core::profiles::Profile;
2424
use cargo::core::{PackageId, Target, TargetKind};
2525
use cargo::util::ProcessBuilder;
@@ -477,7 +477,7 @@ pub(crate) struct OwnedUnit {
477477
pub(crate) id: PackageId,
478478
pub(crate) target: Target,
479479
pub(crate) profile: Profile,
480-
pub(crate) kind: Kind,
480+
pub(crate) kind: CompileKind,
481481
pub(crate) mode: CompileMode,
482482
}
483483

0 commit comments

Comments
 (0)