Skip to content

Commit a9bed52

Browse files
committed
Update to latest Cargo 0.48
1 parent f8eeefc commit a9bed52

File tree

5 files changed

+65
-57
lines changed

5 files changed

+65
-57
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ futures = "0.3.4"
3333
serde = "1.0"
3434

3535
# CARGO VERSION BOUND dependencies
36-
cargo = "0.43.1"
37-
semver = "0.9.0"
36+
cargo = "0.48.0"
3837
flate2 = "1.0.3"
39-
tar = "0.4.18"
38+
semver = "0.10.0"
39+
tar = "0.4.26"
4040

4141
# Optional dependencies
4242
cargo-readme = { version="3.2", optional = true }

src/cli.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
use cargo::{
2-
core::{package::Package, InternedString, Verbosity, Workspace},
3-
util::config::Config as CargoConfig,
2+
core::{package::Package, Verbosity, Workspace},
3+
util::{
4+
config::Config as CargoConfig,
5+
interning::InternedString,
6+
},
47
};
58
use flexi_logger::Logger;
69
use log::trace;

src/commands/check.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@ fn run_check(
114114
ops::compile_with_exec(
115115
&ws,
116116
&ops::CompileOptions {
117-
config,
118-
build_config: BuildConfig::new(config, opts.jobs, &opts.target, build_mode)?,
117+
build_config: BuildConfig::new(config, opts.jobs, &opts.targets, build_mode)?,
119118
features: opts.features.clone(),
120119
no_default_features: opts.no_default_features,
121120
all_features: opts.all_features,
@@ -127,7 +126,6 @@ fn run_check(
127126
target_rustc_args: rustc_args,
128127
local_rustdoc_args: None,
129128
rustdoc_document_private_items: false,
130-
export_dir: None,
131129
},
132130
&exec,
133131
)?;
@@ -226,6 +224,8 @@ pub fn check<'a>(
226224
})
227225
.collect::<HashMap<_, _>>();
228226

227+
// FIXME: make build config configurable
228+
// https://github.com/paritytech/cargo-unleash/issues/20
229229
let opts = PackageOpts {
230230
config: c,
231231
verify: false,
@@ -235,8 +235,8 @@ pub fn check<'a>(
235235
all_features: false,
236236
no_default_features: false,
237237
jobs: None,
238-
target: None,
239-
features: Vec::new(),
238+
targets: Default::default(),
239+
features: Default::default(),
240240
};
241241

242242
c.shell().status("Checking", "Metadata & Dependencies")?;

src/commands/release.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ pub fn release<'a>(
2424
no_default_features: false,
2525
index: None,
2626
jobs: None,
27-
target: None,
27+
targets: Default::default(),
2828
registry: None,
29-
features: Vec::new(),
29+
features: Default::default(),
3030
};
3131

3232
let delay = {

0 commit comments

Comments
 (0)