Skip to content

Commit 4d4b911

Browse files
Use itertools
1 parent 41d73d1 commit 4d4b911

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/project_model/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ cargo_metadata = "=0.12.0"
1616
serde = { version = "1.0.106", features = ["derive"] }
1717
serde_json = "1.0.48"
1818
anyhow = "1.0.26"
19+
itertools = "0.9.0"
1920

2021
arena = { path = "../arena", version = "0.0.0" }
2122
cfg = { path = "../cfg", version = "0.0.0" }

crates/project_model/src/cargo_workspace.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use anyhow::{Context, Result};
1111
use arena::{Arena, Idx};
1212
use base_db::Edition;
1313
use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId};
14+
use itertools::Itertools;
1415
use paths::{AbsPath, AbsPathBuf};
1516
use rustc_hash::FxHashMap;
1617

@@ -407,9 +408,8 @@ fn inject_cargo_env(package: &cargo_metadata::Package, env: &mut Vec<(String, St
407408
env.push(("CARGO_PKG_VERSION_MINOR".into(), package.version.minor.to_string()));
408409
env.push(("CARGO_PKG_VERSION_PATCH".into(), package.version.patch.to_string()));
409410

410-
let pre = package.version.pre.iter().map(|id| id.to_string()).collect::<Vec<_>>();
411-
let pre = pre.join(".");
412-
env.push(("CARGO_PKG_VERSION_PRE".into(), pre));
411+
let pre = package.version.pre.iter().map(|id| id.to_string()).format(".");
412+
env.push(("CARGO_PKG_VERSION_PRE".into(), pre.to_string()));
413413

414414
let authors = package.authors.join(";");
415415
env.push(("CARGO_PKG_AUTHORS".into(), authors));

0 commit comments

Comments
 (0)