Skip to content

Commit f199d07

Browse files
authored
Merge pull request #4408 from nyurik/cargo-simple
chore: cleanup Cargo.toml and rm perl
2 parents bf63904 + d8e39a2 commit f199d07

File tree

5 files changed

+13
-27
lines changed

5 files changed

+13
-27
lines changed

.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ jobs:
255255
steps:
256256
- uses: actions/checkout@master
257257
- run: |
258-
msrv="$(perl -ne 'print if s/rust-version\s*=\s*"(.*)"/\1/g' ctest/Cargo.toml)"
258+
msrv="$(cargo metadata --format-version 1 | jq -r --arg CRATE_NAME ctest '.packages | map(select(.name == $CRATE_NAME)) | first | .rust_version')"
259259
echo "MSRV: $msrv"
260260
echo "MSRV=$msrv" >> "$GITHUB_ENV"
261261
- name: Install Rust

Cargo.toml

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
[package]
22
name = "libc"
33
version = "1.0.0-alpha.1"
4-
authors = ["The Rust Project Developers"]
5-
license = "MIT OR Apache-2.0"
6-
readme = "README.md"
7-
edition = "2021"
8-
repository = "https://github.com/rust-lang/libc"
9-
homepage = "https://github.com/rust-lang/libc"
10-
documentation = "https://docs.rs/libc/"
114
keywords = ["libc", "ffi", "bindings", "operating", "system"]
125
categories = ["external-ffi-bindings", "no-std", "os"]
13-
build = "build.rs"
146
exclude = ["/ci/*", "/.github/*", "/.cirrus.yml", "/triagebot.toml"]
15-
rust-version = "1.63"
167
description = "Raw FFI bindings to platform libraries like libc."
178
publish = false # On the main branch, we don't want to publish anything
9+
authors = ["The Rust Project Developers"]
10+
edition = "2021"
11+
license = "MIT OR Apache-2.0"
12+
repository = "https://github.com/rust-lang/libc"
13+
rust-version = "1.63"
1814

1915
[package.metadata.docs.rs]
2016
features = ["extra_traits"]

ctest-test/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
name = "ctest-test"
33
version = "0.1.0"
44
authors = ["Alex Crichton <[email protected]>"]
5-
build = "build.rs"
6-
edition = "2021"
75
publish = false
6+
edition = "2021"
87

98
[build-dependencies]
109
ctest = { path = "../ctest" }

ctest/Cargo.toml

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
[package]
22
name = "ctest"
33
version = "0.4.11"
4-
license = "MIT OR Apache-2.0"
5-
readme = "README.md"
6-
repository = "https://github.com/rust-lang/libc"
7-
homepage = "https://github.com/rust-lang/libc"
8-
documentation = "https://docs.rs/ctest"
9-
description = """
10-
Automated tests of FFI bindings.
11-
"""
4+
description = "Automated tests of FFI bindings."
125
exclude = ["CHANGELOG.md"]
136
edition = "2021"
7+
license = "MIT OR Apache-2.0"
8+
repository = "https://github.com/rust-lang/libc"
149
rust-version = "1.63.0"
1510

1611
[dependencies]

libc-test/Cargo.toml

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
[package]
22
name = "libc-test"
33
version = "0.1.0"
4-
edition = "2021"
4+
description = "A test crate for the libc crate."
5+
publish = false
56
authors = ["The Rust Project Developers"]
7+
edition = "2021"
68
license = "MIT OR Apache-2.0"
7-
build = "build.rs"
8-
publish = false
99
repository = "https://github.com/rust-lang/libc"
10-
homepage = "https://github.com/rust-lang/libc"
11-
description = """
12-
A test crate for the libc crate.
13-
"""
1410

1511
[dependencies]
1612
cfg-if = "1.0.0"

0 commit comments

Comments
 (0)