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

Commit c0f07b3

Browse files
committed
Update to latest Cargo master
1 parent 4928a20 commit c0f07b3

File tree

3 files changed

+16
-35
lines changed

3 files changed

+16
-35
lines changed

Cargo.lock

Lines changed: 8 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ categories = ["development-tools"]
1010
build = "build.rs"
1111

1212
[dependencies]
13-
# cargo hash delivered with nightly-2018-03-14
14-
cargo = { git = "https://github.com/rust-lang/cargo", rev = "5f83bb4044f32b60d06717c609610f67411fc671" }
13+
cargo = { git = "https://github.com/rust-lang/cargo", rev = "1184854427a938bd981f037f19364ad8713fe13b" }
1514
cargo_metadata = "0.5.2"
1615
env_logger = "0.5"
1716
failure = "0.1.1"

src/build/cargo.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,25 +185,25 @@ fn run_cargo(
185185
(opts, rustflags, rls_config.clear_env_rust_log)
186186
};
187187

188-
let spec = Packages::from_flags(false, &[], &packages)?;
188+
let spec = Packages::from_flags(false, Vec::new(), packages)?;
189189

190190
let compile_opts = CompileOptions {
191-
target: opts.target.as_ref().map(|t| &t[..]),
191+
target: opts.target,
192192
spec,
193193
filter: CompileFilter::new(
194194
opts.lib,
195-
&opts.bin,
195+
opts.bin,
196196
opts.bins,
197197
// TODO: Support more crate target types
198-
&[],
198+
Vec::new(),
199199
false,
200-
&[],
200+
Vec::new(),
201201
false,
202-
&[],
202+
Vec::new(),
203203
false,
204204
opts.all_targets,
205205
),
206-
features: &opts.features,
206+
features: opts.features,
207207
all_features: opts.all_features,
208208
no_default_features: opts.no_default_features,
209209
jobs: opts.jobs,

0 commit comments

Comments
 (0)