Skip to content

Commit acf9017

Browse files
committed
Bump to cargo 0.91
1 parent 17ec22d commit acf9017

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cargo-c"
3-
version = "0.10.15+cargo-0.90.0"
3+
version = "0.10.16+cargo-0.91.0"
44
authors = ["Luca Barbato <lu_zero@gentoo.org>"]
55
description = "Helper program to build and install c-like libraries"
66
license = "MIT"
@@ -9,7 +9,7 @@ readme = "README.md"
99
repository = "https://github.com/lu-zero/cargo-c"
1010
categories = ["command-line-utilities", "development-tools::cargo-plugins"]
1111
keywords = ["cargo", "cdylib"]
12-
rust-version = "1.87"
12+
rust-version = "1.88"
1313

1414
[[bin]]
1515
name = "cargo-capi"
@@ -28,7 +28,7 @@ name = "cargo-ctest"
2828
path = "src/bin/ctest.rs"
2929

3030
[dependencies]
31-
cargo = "0.90.0"
31+
cargo = "0.91.0"
3232
cargo-util = "0.2"
3333
semver = "1.0.3"
3434
log = "0.4"

src/build.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ fn compile_with_exec(
939939
.iter()
940940
.filter_map(|l| {
941941
let id = l.unit.pkg.package_id();
942-
if let Some(ref m) = l.script_meta {
942+
l.script_metas.iter().flatten().find_map(|m| {
943943
if let Some(env) = r.extra_env.get(m) {
944944
env.iter().find_map(|e| {
945945
if e.0 == "OUT_DIR" {
@@ -951,9 +951,7 @@ fn compile_with_exec(
951951
} else {
952952
None
953953
}
954-
} else {
955-
None
956-
}
954+
})
957955
})
958956
.collect();
959957

0 commit comments

Comments
 (0)