Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use workspace.package inheritance for most package fields #804

Merged
merged 1 commit into from
Jan 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Cargo.lock

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

11 changes: 11 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,16 @@ exclude = [
"tests",
]

[workspace.package]
version = "0.16.0"
authors = ["The C2Rust Project Developers <[email protected]>"]
edition = "2021"
readme = "README.md"
homepage = "https://c2rust.com/"
repository = "https://github.com/immunant/c2rust/"
license = "BSD-3-Clause"
keywords = ["transpiler", "migration", "translation", "c"]
categories = ["development-tools", "development-tools::ffi", "command-line-utilities"]

[profile.dev.package."*"]
opt-level = 3
13 changes: 9 additions & 4 deletions analysis/runtime/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
[package]
name = "c2rust-analysis-rt"
version = "0.1.0"
authors = ["The C2Rust Development Team <[email protected]>",
"Stephen Crane <[email protected]>"]
edition = "2021"
version.workspace = true
authors.workspace = true
edition.workspace = true
description = "C2Rust runtime for recording dynamic analysis, targeted by c2rust-instrument and consumed by c2rust-pdg"
readme.workspace = true
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true

[dependencies]
serde = { version = "1.0", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion analysis/tests/lighttpd-minimal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"

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

[features]
miri = []
2 changes: 1 addition & 1 deletion analysis/tests/lighttpd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"

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

[features]
miri = []
2 changes: 1 addition & 1 deletion analysis/tests/misc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"

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

[features]
miri = []
11 changes: 9 additions & 2 deletions c2rust-analyze/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
[package]
name = "c2rust-analyze"
version = "0.1.0"
edition = "2021"
version.workspace = true
authors.workspace = true
edition.workspace = true
description = "C2Rust analysis implementation for lifting unsafe Rust to safe Rust"
readme = "README.md"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true

[dependencies]
polonius-engine = "0.13.0"
Expand Down
15 changes: 9 additions & 6 deletions c2rust-asm-casts/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
[package]
name = "c2rust-asm-casts"
version = "0.2.0"
authors = ["The C2Rust Project Developers <[email protected]>"]
edition = "2021"
license = "BSD-3-Clause"
homepage = "https://c2rust.com/"
repository = "https://github.com/immunant/c2rust/tree/master/c2rust-asm-casts"
version.workspace = true
authors.workspace = true
edition.workspace = true
description = "Type cast helpers for use with C2Rust's inline assembly implementation"
readme.workspace = true
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true

[dependencies]
18 changes: 9 additions & 9 deletions c2rust-ast-builder/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[package]
name = "c2rust-ast-builder"
version = "0.16.0"
authors = [
"The C2Rust Project Developers <[email protected]>",
"Eric Mertens <[email protected]>",
]
license = "BSD-3-Clause"
homepage = "https://c2rust.com/"
repository = "https://github.com/immunant/c2rust"
version.workspace = true
authors.workspace = true
edition.workspace = true
description = "Rust AST builder support crate for the C2Rust project"
edition = "2021"
readme.workspace = true
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true

[dependencies]
proc-macro2 = { version = "1.0", features = ["span-locations"]}
Expand Down
21 changes: 10 additions & 11 deletions c2rust-ast-exporter/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
[package]
name = "c2rust-ast-exporter"
version = "0.16.0"
authors = [
"The C2Rust Project Developers <[email protected]>",
"Eric Mertens <[email protected]>",
"Alec Theriault <[email protected]>",
]
links = "clangAstExporter"
license = "BSD-3-Clause"
homepage = "https://c2rust.com/"
repository = "https://github.com/immunant/c2rust"
version.workspace = true
authors.workspace = true
edition.workspace = true
description = "Clang AST extraction API for use in the C2Rust project"
edition = "2021"
readme.workspace = true
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true
links = "clangAstExporter"

[dependencies]
libc = "0.2"
Expand Down
14 changes: 9 additions & 5 deletions c2rust-ast-printer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[package]
name = "c2rust-ast-printer"
version = "0.16.0"
authors = ["The Rust Project Developers", "Stephen Crane <[email protected]>"]
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/immunant/c2rust"
version.workspace = true
authors = ["The C2Rust Project Developers <[email protected]>", "The Rust Project Developers"]
edition.workspace = true
description = "Customized version of libsyntax rust pretty-printer"
readme = "README.md"
homepage.workspace = true
repository.workspace = true
license = "MIT OR Apache-2.0"
keywords.workspace = true
categories.workspace = true

[dependencies]
log = "0.4"
Expand Down
17 changes: 8 additions & 9 deletions c2rust-bitfields-derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
[package]
name = "c2rust-bitfields-derive"
version = "0.2.1"
authors = [
"The C2Rust Project Developers <[email protected]>",
"Daniel Kolsoi <[email protected]>",
]
license = "BSD-3-Clause"
homepage = "https://c2rust.com/"
repository = "https://github.com/immunant/c2rust/tree/master/c2rust-bitfields-derive"
edition = "2021"
version.workspace = true
authors.workspace = true
edition.workspace = true
description = "C-compatible struct bitfield derive implementation used in the C2Rust project"
readme = "README.md"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true

[dependencies]
proc-macro2 = "1.0"
Expand Down
19 changes: 9 additions & 10 deletions c2rust-bitfields/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
[package]
name = "c2rust-bitfields"
version = "0.3.0"
authors = [
"The C2Rust Project Developers <[email protected]>",
"Daniel Kolsoi <[email protected]>",
]
license = "BSD-3-Clause"
homepage = "https://c2rust.com/"
repository = "https://github.com/immunant/c2rust/tree/master/c2rust-bitfields"
edition = "2021"
version.workspace = true
authors.workspace = true
edition.workspace = true
description = "C-compatible struct bitfield implementation used in the C2Rust project"
readme = "README.md"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true

[dependencies]
c2rust-bitfields-derive = { version = "0.2", path = "../c2rust-bitfields-derive" }
c2rust-bitfields-derive = { version = "0.16.0", path = "../c2rust-bitfields-derive" }

[dev-dependencies]
libc = "0.2"
Expand Down
11 changes: 9 additions & 2 deletions c2rust-build-paths/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
[package]
name = "c2rust-build-paths"
version = "0.1.0"
edition = "2021"
version.workspace = true
authors.workspace = true
edition.workspace = true
description = "C2Rust utilities related to build paths, primarily at build time"
readme.workspace = true
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true

[dependencies]
print_bytes = "1.1"
21 changes: 10 additions & 11 deletions c2rust-transpile/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
[package]
name = "c2rust-transpile"
version = "0.16.0"
authors = [
"The C2Rust Project Developers <[email protected]>",
"Eric Mertens <[email protected]>",
"Alec Theriault <[email protected]>",
]
license = "BSD-3-Clause"
homepage = "https://c2rust.com/"
repository = "https://github.com/immunant/c2rust"
version.workspace = true
authors.workspace = true
edition.workspace = true
description = "C2Rust transpiler implementation"
edition = "2021"
readme.workspace = true
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true

[dependencies]
c2rust-ast-builder = { version = "0.16.0", path = "../c2rust-ast-builder" }
c2rust-ast-exporter = { version = "0.16.0", path = "../c2rust-ast-exporter" }
c2rust-ast-printer = { version = "0.16.0", path = "../c2rust-ast-printer" }
c2rust-bitfields = { version = "0.3.0", path = "../c2rust-bitfields" }
c2rust-bitfields = { version = "0.16.0", path = "../c2rust-bitfields" }
colored = "2.0"
dtoa = "1.0"
failure = "0.1.5"
Expand Down
16 changes: 8 additions & 8 deletions c2rust/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[package]
name = "c2rust"
version.workspace = true
authors.workspace = true
edition.workspace = true
description = "C to Rust translation, refactoring, and cross-checking"
version = "0.16.0"
authors = ["The C2Rust Project Developers <[email protected]>"]
license = "BSD-3-Clause"
homepage = "https://c2rust.com/"
repository = "https://github.com/immunant/c2rust"
edition = "2021"
categories = ["development-tools", "development-tools::ffi", "command-line-utilities"]
keywords = ["transpiler", "migration", "translation", "c"]
readme = "README.md"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true
default-run = "c2rust"

[badges]
Expand Down
11 changes: 9 additions & 2 deletions dynamic_instrumentation/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
[package]
name = "c2rust-instrument"
version = "0.1.0"
edition = "2021"
version.workspace = true
authors.workspace = true
edition.workspace = true
description = "C2Rust instrumentation of Rust code for dynamic analysis"
readme.workspace = true
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true

[dependencies]
anyhow = "1.0"
Expand Down
Loading