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

cargo: sync the edition of all packages #178

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
7 changes: 5 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ members = [
"provers/risc0/driver",
"provers/risc0/builder",
"provers/sgx/prover",
"provers/sgx/guest",
"provers/sgx/guest",
"provers/sgx/setup",
"pipeline",
]

[workspace.package]
edition = "2021"

# Always optimize; building and running the guest takes much longer without optimization.
[profile.dev]
opt-level = 3
Expand Down Expand Up @@ -159,4 +162,4 @@ rand = "0.8.5"
rand_core = "0.6.4"
base64-serde = "0.7.0"
base64 = "0.21.7"
dirs = "5.0.1"
dirs = "5.0.1"
2 changes: 1 addition & 1 deletion host/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "raiko-host"
version = "0.1.0"
edition = "2021"
edition = { workspace = true }
default-run = "raiko-host"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion lib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "raiko-lib"
version = "0.1.0"
edition = "2021"
edition = { workspace = true }

[dependencies]
raiko-primitives = { workspace = true }
Expand Down
3 changes: 1 addition & 2 deletions pipeline/examples/builder/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "builder"
version = "0.1.0"
edition = "2021"
edition = { workspace = true }

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand All @@ -12,4 +12,3 @@ raiko-pipeline = { workspace = true }
[features]
sp1 = ["raiko-pipeline/sp1"]
risc0 = ["raiko-pipeline/risc0"]

3 changes: 1 addition & 2 deletions pipeline/examples/driver/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "driver"
version = "0.1.0"
edition = "2021"
edition = { workspace = true }

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand All @@ -16,4 +16,3 @@ methods = { path = "../risc0/methods", optional = true }
# default = ["sp1", "risc0"]
sp1 = ["dep:sp1-sdk"]
risc0 = ["dep:risc0-zkvm", "dep:methods"]

4 changes: 2 additions & 2 deletions pipeline/examples/risc0/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "example"
version = "0.1.0"
edition = "2021"
edition = { workspace = true }

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down Expand Up @@ -29,4 +29,4 @@ c-kzg-taiko = { git = "https://github.com/smtmfft/c-kzg-4844", branch = "for-alp
] }
sha2 = "0.10.8"

[workspace]
[workspace]
4 changes: 2 additions & 2 deletions pipeline/examples/risc0/methods/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "methods"
version = "0.1.0"
edition = "2021"
edition = { workspace = true }

[workspace]
[workspace]
4 changes: 2 additions & 2 deletions pipeline/examples/sp1/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "example"
version = "0.1.0"
edition = "2021"
edition = { workspace = true }

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down Expand Up @@ -29,4 +29,4 @@ c-kzg-taiko = { git = "https://github.com/smtmfft/c-kzg-4844", branch = "for-alp
] }
sha2 = "0.10.8"

[workspace]
[workspace]
4 changes: 2 additions & 2 deletions pipeline/harness/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "harness"
version = "0.1.0"
edition = "2021"
edition = { workspace = true }

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
once_cell = "1.8.0"

[workspace]
[workspace]
4 changes: 2 additions & 2 deletions primitives/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "raiko-primitives"
version = "0.1.0"
edition = "2021"
edition = { workspace = true }

[dependencies]
alloy-primitives = { workspace = true }
Expand Down Expand Up @@ -34,4 +34,4 @@ serde_json = { version = "1.0", default-features = false }

[features]
std = ["anyhow/std", "rlp/std"]
c-kzg = ["dep:c-kzg", "revm-primitives/c-kzg", "dep:sha2", "dep:tempfile", "dep:once_cell"]
c-kzg = ["dep:c-kzg", "revm-primitives/c-kzg", "dep:sha2", "dep:tempfile", "dep:once_cell"]
1 change: 0 additions & 1 deletion provers/powdr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ powdr-riscv-runtime ={ git = "https://github.com/ceciliaz030/powdr", branch = "+


# cargo build --release -Z build-std=core,alloc --target riscv32imac-unknown-none-elf --lib

4 changes: 2 additions & 2 deletions provers/risc0/builder/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "risc0-builder"
version = "0.1.0"
edition = "2021"
edition = { workspace = true }

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
raiko-pipeline = { path = "../../../pipeline", features = ["risc0"]}

[features]
test = []
test = []
4 changes: 2 additions & 2 deletions provers/risc0/driver/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "risc0-driver"
version = "0.1.0"
edition = "2021"
edition = { workspace = true }

[dependencies]
raiko-lib = { workspace = true, optional = true }
Expand Down Expand Up @@ -57,4 +57,4 @@ enable = [
"hex",
]
cuda = ["risc0-zkvm?/cuda"]
metal = ["risc0-zkvm?/metal"]
metal = ["risc0-zkvm?/metal"]
2 changes: 1 addition & 1 deletion provers/sgx/prover/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "sgx-prover"
version = "0.1.0"
edition = "2021"
edition = { workspace = true }

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
2 changes: 1 addition & 1 deletion provers/sgx/setup/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[package]
name = "raiko-setup"
version = "0.1.0"
edition = "2021"
edition = { workspace = true }

[dependencies]
# sp1-driver = { path = "../provers/sp1/driver", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions provers/sp1/builder/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
name = "sp1-builder"
version = "0.1.0"
edition = "2021"
edition = { workspace = true }

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
raiko-pipeline = { path = "../../../pipeline", features = ["sp1"]}

[features]
test = []
test = []
2 changes: 1 addition & 1 deletion provers/sp1/driver/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
version = "0.1.0"
name = "sp1-driver"
edition = "2021"
edition = { workspace = true }

[dependencies]
raiko-lib = { workspace = true, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion provers/sp1/guest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ sp1-precompiles = { git = "https://www.github.com/succinctlabs/sp1.git", branch

[workspace]

# cargo prove build
# cargo prove build
Loading