Skip to content

Commit

Permalink
Orizi/merge v2.0.0 rc2 into main (#3415)
Browse files Browse the repository at this point in the history
  • Loading branch information
orizi authored Jun 14, 2023
2 parents cb908eb + 1aa14b4 commit 7d87b08
Show file tree
Hide file tree
Showing 50 changed files with 283 additions and 424 deletions.
82 changes: 41 additions & 41 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ members = [
]

[workspace.package]
version = "2.0.0-rc0"
version = "2.0.0-rc2"
edition = "2021"
repository = "https://github.com/starkware-libs/cairo/"
license = "Apache-2.0"
Expand Down Expand Up @@ -86,7 +86,7 @@ proc-macro2 = "1.0"
quote = "1.0.21"
rayon = "1.7.0"
rstest = "0.16.0"
salsa = "0.17.0-pre.2"
salsa = "0.16.1"
scarb-metadata = "1.3.0"
schemars = { version = "0.8.12", features = ["preserve_order"] }
serde = { version = "1.0.130", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion corelib/Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "core"
version = "2.0.0-rc0"
version = "2.0.0-rc2"

# NOTE: This is non-public, unstable Scarb's field, which instructs resolver that this package does not
# depend on `core`, which is only true for this particular package. Nobody else should use it.
Expand Down
Loading

0 comments on commit 7d87b08

Please sign in to comment.