Skip to content

Commit

Permalink
Bumps to cargo 0.58.0 (#230)
Browse files Browse the repository at this point in the history
* Bumps to cargo 0.58.0

* Bumps to cargo 0.58.0 and rustfmt happy
  • Loading branch information
pinkforest authored Dec 20, 2021
1 parent af41aae commit 95143e2
Show file tree
Hide file tree
Showing 8 changed files with 122 additions and 89 deletions.
127 changes: 72 additions & 55 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion cargo-geiger/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ maintenance = { status = "experimental" }

[dependencies]
anyhow = "1.0.40"
cargo = "0.52.0"
cargo = "0.58.0"
cargo-geiger-serde = { path = "../cargo-geiger-serde", version = "0.2.0" }
cargo_metadata = "0.14.1"
cargo-platform = "0.1.1"
Expand All @@ -32,6 +32,7 @@ strum = "0.23.0"
strum_macros = "0.23.1"
walkdir = "2.3.2"
url = "2.2.1"
cargo-util = "0.1.1"

[features]
vendored-openssl = ["cargo/vendored-openssl"]
Expand Down
7 changes: 4 additions & 3 deletions cargo-geiger/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use crate::args::Args;
// TODO: Consider making this a lib.rs (again) and expose a full API, excluding
// only the terminal output..? That API would be dependent on cargo.
use cargo::core::Workspace;
use cargo::util::{self, important_paths, CargoResult};
use cargo::util::{important_paths, CargoResult};
use cargo::Config;
use cargo_metadata::{CargoOpt, Metadata, MetadataCommand};
use cargo_platform::Cfg;
Expand Down Expand Up @@ -57,8 +57,9 @@ pub fn get_cfgs(
target: &Option<String>,
workspace: &Workspace,
) -> CargoResult<Option<Vec<Cfg>>> {
let mut process =
util::process(&config.load_global_rustc(Some(workspace))?.path);
let mut process = cargo_util::ProcessBuilder::new(
&config.load_global_rustc(Some(workspace))?.path,
);
process.arg("--print=cfg").env_remove("RUST_LOG");
if let Some(ref s) = *target {
process.arg("--target").arg(s);
Expand Down
Loading

0 comments on commit 95143e2

Please sign in to comment.