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

Update cargo #1782

Merged
merged 1 commit into from
Aug 3, 2022
Merged

Update cargo #1782

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
57 changes: 32 additions & 25 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 @@ -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 = "3f052d8eed98c6a24f8b332fb2e6e6249d12d8c1" }
cargo-util = { git = "https://github.com/rust-lang/cargo", rev = "3f052d8eed98c6a24f8b332fb2e6e6249d12d8c1" }
cargo = { git = "https://github.com/rust-lang/cargo", rev = "5514f1e0e1b3650ed8a78306198e90b66b292693" }
cargo-util = { git = "https://github.com/rust-lang/cargo", rev = "5514f1e0e1b3650ed8a78306198e90b66b292693" }
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 Down
2 changes: 1 addition & 1 deletion rls/src/build/cargo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ struct CargoOptions {
all_features: bool,
no_default_features: bool,
features: Vec<String>,
jobs: Option<u32>,
jobs: Option<i32>,
all_targets: bool,
}

Expand Down
2 changes: 1 addition & 1 deletion rls/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ pub struct Config {
pub features: Vec<String>,
pub all_features: bool,
pub no_default_features: bool,
pub jobs: Option<u32>,
pub jobs: Option<i32>,
pub all_targets: bool,
/// Enables use of Racer for `textDocument/completion` requests.
///
Expand Down