Skip to content

Commit 4bb830e

Browse files
kkysenfw-immunant
authored andcommitted
Use workspace.package inheritance for most package fields to standardize and sync fields.
1 parent b1d76be commit 4bb830e

File tree

18 files changed

+139
-92
lines changed

18 files changed

+139
-92
lines changed

Cargo.lock

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+11
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,16 @@ exclude = [
2222
"tests",
2323
]
2424

25+
[workspace.package]
26+
version = "0.16.0"
27+
authors = ["The C2Rust Project Developers <[email protected]>"]
28+
edition = "2021"
29+
readme = "README.md"
30+
homepage = "https://c2rust.com/"
31+
repository = "https://github.com/immunant/c2rust/"
32+
license = "BSD-3-Clause"
33+
keywords = ["transpiler", "migration", "translation", "c"]
34+
categories = ["development-tools", "development-tools::ffi", "command-line-utilities"]
35+
2536
[profile.dev.package."*"]
2637
opt-level = 3

analysis/runtime/Cargo.toml

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
[package]
22
name = "c2rust-analysis-rt"
3-
version = "0.1.0"
4-
authors = ["The C2Rust Development Team <[email protected]>",
5-
"Stephen Crane <[email protected]>"]
6-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
76
description = "C2Rust runtime for recording dynamic analysis, targeted by c2rust-instrument and consumed by c2rust-pdg"
7+
readme.workspace = true
8+
homepage.workspace = true
9+
repository.workspace = true
10+
license.workspace = true
11+
keywords.workspace = true
12+
categories.workspace = true
813

914
[dependencies]
1015
serde = { version = "1.0", features = ["derive"] }

analysis/tests/lighttpd-minimal/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55

66
[dependencies]
77
libc = "0.2"
8-
c2rust-analysis-rt = { path = "../../runtime", optional = true, version = "0.1.0" }
8+
c2rust-analysis-rt = { path = "../../runtime", optional = true, version = "0.16.0" }
99

1010
[features]
1111
miri = []

analysis/tests/lighttpd/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55

66
[dependencies]
77
libc = "0.2"
8-
c2rust-analysis-rt = { path = "../../runtime", optional = true, version = "0.1.0" }
8+
c2rust-analysis-rt = { path = "../../runtime", optional = true, version = "0.16.0" }
99

1010
[features]
1111
miri = []

analysis/tests/misc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition = "2021"
77

88
[dependencies]
99
libc = "0.2"
10-
c2rust-analysis-rt = { path = "../../runtime", optional = true, version = "0.1.0" }
10+
c2rust-analysis-rt = { path = "../../runtime", optional = true, version = "0.16.0" }
1111

1212
[features]
1313
miri = []

c2rust-analyze/Cargo.toml

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
[package]
22
name = "c2rust-analyze"
3-
version = "0.1.0"
4-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
56
description = "C2Rust analysis implementation for lifting unsafe Rust to safe Rust"
7+
readme = "README.md"
8+
homepage.workspace = true
9+
repository.workspace = true
10+
license.workspace = true
11+
keywords.workspace = true
12+
categories.workspace = true
613

714
[dependencies]
815
polonius-engine = "0.13.0"

c2rust-asm-casts/Cargo.toml

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
[package]
22
name = "c2rust-asm-casts"
3-
version = "0.2.0"
4-
authors = ["The C2Rust Project Developers <[email protected]>"]
5-
edition = "2021"
6-
license = "BSD-3-Clause"
7-
homepage = "https://c2rust.com/"
8-
repository = "https://github.com/immunant/c2rust/tree/master/c2rust-asm-casts"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
96
description = "Type cast helpers for use with C2Rust's inline assembly implementation"
7+
readme.workspace = true
8+
homepage.workspace = true
9+
repository.workspace = true
10+
license.workspace = true
11+
keywords.workspace = true
12+
categories.workspace = true
1013

1114
[dependencies]

c2rust-ast-builder/Cargo.toml

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[package]
22
name = "c2rust-ast-builder"
3-
version = "0.16.0"
4-
authors = [
5-
"The C2Rust Project Developers <[email protected]>",
6-
"Eric Mertens <[email protected]>",
7-
]
8-
license = "BSD-3-Clause"
9-
homepage = "https://c2rust.com/"
10-
repository = "https://github.com/immunant/c2rust"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
116
description = "Rust AST builder support crate for the C2Rust project"
12-
edition = "2021"
7+
readme.workspace = true
8+
homepage.workspace = true
9+
repository.workspace = true
10+
license.workspace = true
11+
keywords.workspace = true
12+
categories.workspace = true
1313

1414
[dependencies]
1515
proc-macro2 = { version = "1.0", features = ["span-locations"]}

c2rust-ast-exporter/Cargo.toml

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
[package]
22
name = "c2rust-ast-exporter"
3-
version = "0.16.0"
4-
authors = [
5-
"The C2Rust Project Developers <[email protected]>",
6-
"Eric Mertens <[email protected]>",
7-
"Alec Theriault <[email protected]>",
8-
]
9-
links = "clangAstExporter"
10-
license = "BSD-3-Clause"
11-
homepage = "https://c2rust.com/"
12-
repository = "https://github.com/immunant/c2rust"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
136
description = "Clang AST extraction API for use in the C2Rust project"
14-
edition = "2021"
7+
readme.workspace = true
8+
homepage.workspace = true
9+
repository.workspace = true
10+
license.workspace = true
11+
keywords.workspace = true
12+
categories.workspace = true
13+
links = "clangAstExporter"
1514

1615
[dependencies]
1716
libc = "0.2"

c2rust-ast-printer/Cargo.toml

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
[package]
22
name = "c2rust-ast-printer"
3-
version = "0.16.0"
4-
authors = ["The Rust Project Developers", "Stephen Crane <[email protected]>"]
5-
edition = "2021"
6-
license = "MIT OR Apache-2.0"
7-
repository = "https://github.com/immunant/c2rust"
3+
version.workspace = true
4+
authors = ["The C2Rust Project Developers <[email protected]>", "The Rust Project Developers"]
5+
edition.workspace = true
86
description = "Customized version of libsyntax rust pretty-printer"
7+
readme = "README.md"
8+
homepage.workspace = true
9+
repository.workspace = true
10+
license = "MIT OR Apache-2.0"
11+
keywords.workspace = true
12+
categories.workspace = true
913

1014
[dependencies]
1115
log = "0.4"

c2rust-bitfields-derive/Cargo.toml

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
[package]
22
name = "c2rust-bitfields-derive"
3-
version = "0.2.1"
4-
authors = [
5-
"The C2Rust Project Developers <[email protected]>",
6-
"Daniel Kolsoi <[email protected]>",
7-
]
8-
license = "BSD-3-Clause"
9-
homepage = "https://c2rust.com/"
10-
repository = "https://github.com/immunant/c2rust/tree/master/c2rust-bitfields-derive"
11-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
126
description = "C-compatible struct bitfield derive implementation used in the C2Rust project"
137
readme = "README.md"
8+
homepage.workspace = true
9+
repository.workspace = true
10+
license.workspace = true
11+
keywords.workspace = true
12+
categories.workspace = true
1413

1514
[dependencies]
1615
proc-macro2 = "1.0"

c2rust-bitfields/Cargo.toml

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
[package]
22
name = "c2rust-bitfields"
3-
version = "0.3.0"
4-
authors = [
5-
"The C2Rust Project Developers <[email protected]>",
6-
"Daniel Kolsoi <[email protected]>",
7-
]
8-
license = "BSD-3-Clause"
9-
homepage = "https://c2rust.com/"
10-
repository = "https://github.com/immunant/c2rust/tree/master/c2rust-bitfields"
11-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
126
description = "C-compatible struct bitfield implementation used in the C2Rust project"
137
readme = "README.md"
8+
homepage.workspace = true
9+
repository.workspace = true
10+
license.workspace = true
11+
keywords.workspace = true
12+
categories.workspace = true
1413

1514
[dependencies]
16-
c2rust-bitfields-derive = { version = "0.2", path = "../c2rust-bitfields-derive" }
15+
c2rust-bitfields-derive = { version = "0.16.0", path = "../c2rust-bitfields-derive" }
1716

1817
[dev-dependencies]
1918
libc = "0.2"

c2rust-build-paths/Cargo.toml

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
[package]
22
name = "c2rust-build-paths"
3-
version = "0.1.0"
4-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
56
description = "C2Rust utilities related to build paths, primarily at build time"
7+
readme.workspace = true
8+
homepage.workspace = true
9+
repository.workspace = true
10+
license.workspace = true
11+
keywords.workspace = true
12+
categories.workspace = true
613

714
[dependencies]
815
print_bytes = "1.1"

c2rust-transpile/Cargo.toml

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
[package]
22
name = "c2rust-transpile"
3-
version = "0.16.0"
4-
authors = [
5-
"The C2Rust Project Developers <[email protected]>",
6-
"Eric Mertens <[email protected]>",
7-
"Alec Theriault <[email protected]>",
8-
]
9-
license = "BSD-3-Clause"
10-
homepage = "https://c2rust.com/"
11-
repository = "https://github.com/immunant/c2rust"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
126
description = "C2Rust transpiler implementation"
13-
edition = "2021"
7+
readme.workspace = true
8+
homepage.workspace = true
9+
repository.workspace = true
10+
license.workspace = true
11+
keywords.workspace = true
12+
categories.workspace = true
1413

1514
[dependencies]
1615
c2rust-ast-builder = { version = "0.16.0", path = "../c2rust-ast-builder" }
1716
c2rust-ast-exporter = { version = "0.16.0", path = "../c2rust-ast-exporter" }
1817
c2rust-ast-printer = { version = "0.16.0", path = "../c2rust-ast-printer" }
19-
c2rust-bitfields = { version = "0.3.0", path = "../c2rust-bitfields" }
18+
c2rust-bitfields = { version = "0.16.0", path = "../c2rust-bitfields" }
2019
colored = "2.0"
2120
dtoa = "1.0"
2221
failure = "0.1.5"

c2rust/Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[package]
22
name = "c2rust"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
36
description = "C to Rust translation, refactoring, and cross-checking"
4-
version = "0.16.0"
5-
authors = ["The C2Rust Project Developers <[email protected]>"]
6-
license = "BSD-3-Clause"
7-
homepage = "https://c2rust.com/"
8-
repository = "https://github.com/immunant/c2rust"
9-
edition = "2021"
10-
categories = ["development-tools", "development-tools::ffi", "command-line-utilities"]
11-
keywords = ["transpiler", "migration", "translation", "c"]
127
readme = "README.md"
8+
homepage.workspace = true
9+
repository.workspace = true
10+
license.workspace = true
11+
keywords.workspace = true
12+
categories.workspace = true
1313
default-run = "c2rust"
1414

1515
[badges]

dynamic_instrumentation/Cargo.toml

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
[package]
22
name = "c2rust-instrument"
3-
version = "0.1.0"
4-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
56
description = "C2Rust instrumentation of Rust code for dynamic analysis"
7+
readme.workspace = true
8+
homepage.workspace = true
9+
repository.workspace = true
10+
license.workspace = true
11+
keywords.workspace = true
12+
categories.workspace = true
613

714
[dependencies]
815
anyhow = "1.0"

0 commit comments

Comments
 (0)