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

Update cargo and clippy #1462

Merged
merged 2 commits into from
May 18, 2019
Merged

Update cargo and clippy #1462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d8f276
Update cargo and clippy
ehuss May 14, 2019
e18ff49
Update clippy.
ehuss May 18, 2019
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
28 changes: 13 additions & 15 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.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ rls-rustc = { version = "0.6.0", path = "rls-rustc" }
rls-span = "0.5"
rls-vfs = "0.8"

cargo = { git = "https://github.com/rust-lang/cargo", rev = "beb8fcb5248dc2e6aa488af9613216d5ccb31c6a" }
cargo = { git = "https://github.com/rust-lang/cargo", rev = "d56af31df1fbe45105ccd3b633297b2bc61e7405" }
cargo_metadata = "0.7"
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "fc96aa036884183ddc68d2659f4633e6f138b4e0", optional = true }
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "60a609acaed3bf2b3ec6ab995bccf0f03bc26060", optional = true }
env_logger = "0.6"
failure = "0.1.1"
home = "0.3"
Expand Down
2 changes: 2 additions & 0 deletions rls/src/build/cargo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,8 @@ impl Executor for RlsExecutor {
id: PackageId,
target: &Target,
mode: CompileMode,
_on_stdout_line: &mut dyn FnMut(&str) -> CargoResult<()>,
_on_stderr_line: &mut dyn FnMut(&str) -> CargoResult<()>,
) -> CargoResult<()> {
// Use JSON output so that we can parse the rustc output.
cargo_cmd.arg("--error-format=json");
Expand Down
4 changes: 2 additions & 2 deletions rls/src/project_model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ impl ProjectModel {
let mut config = Config::default()?;
// Enable nightly flag for cargo(see #1043)
cargo::core::enable_nightly_features();
// frozen = false, locked = false
config.configure(0, Some(true), &None, false, false, &None, &[])?;
// frozen = false, locked = false, offline = false
config.configure(0, Some(true), &None, false, false, false, &None, &[])?;
let ws = Workspace::new(&ws_manifest, &config)?;
// get resolve from lock file
let prev = {
Expand Down