Merge branch 'main' into fix/doc

lambdaclass · Jun 26, 2023 · 7abe5a0 · 7abe5a0
2 parents 190d0df + 9cef244
commit 7abe5a0
Show file tree

Hide file tree

Showing 15 changed files with 76 additions and 1,031 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,18 @@
 
 #### Upcoming Changes
 
+* build: remove unused implicit features from cairo-vm
+
+#### [0.6.1] - 2023-6-23
+
+* fix: updated the `custom_hint_example` and added it to the workspace [#1258](https://github.com/lambdaclass/cairo-rs/pull/1258)
+
+* Add path to cairo-vm README.md [#1276](https://github.com/lambdaclass/cairo-rs/pull/1276)
+
 * fix: change error returned when subtracting two `MaybeRelocatable`s to better reflect the cause [#1271](https://github.com/lambdaclass/cairo-rs/pull/1271)
 
+* fix: CLI error message when using --help [#1270](https://github.com/lambdaclass/cairo-rs/pull/1270)
+
 #### [0.6.0] - 2023-6-18
 
 * fix: `dibit` hint no longer fails when called with an `m` of zero [#1247](https://github.com/lambdaclass/cairo-rs/pull/1247)
@@ -28,11 +38,12 @@
   * `HintProcessor::compile_hint` now receies a `&[HintReference]` rather than `&HashMap<usize, HintReference>`
   * Public `CairoRunner::get_reference_list` has been removed
 
-* move the vm in it's own directory and crate, different from the workspace
+* BREAKING: Add no_std compatibility to cairo-vm (cairo-1-hints feature still not supported)
+    * Move the vm to its own directory and crate, different from the workspace [#1215](https://github.com/lambdaclass/cairo-rs/pull/1215)
 
-* add a `ensure-no_std` crate that will be used by the CI to check that new changes are not reverting `no_std` support
+    * Add an `ensure_no_std` crate that the CI will use to check that new changes don't revert `no_std` support [#1215](https://github.com/lambdaclass/cairo-rs/pull/1215) [#1232](https://github.com/lambdaclass/cairo-rs/pull/1232) 
 
-* replace the use of `num-prime::is_prime` by a custom implementation, therefore restoring `no_std` compatibility
+    * replace the use of `num-prime::is_prime` by a custom implementation, therefore restoring `no_std` compatibility [#1238](https://github.com/lambdaclass/cairo-rs/pull/1238)
 
 #### [0.5.2] - 2023-6-12
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -52,10 +52,10 @@ thiserror-no-std = { version = "2.0.2", default-features = false }
 # https://stackoverflow.com/questions/70630556/parse-allowing-nested-parentheses-in-nom
 # There is a proposal for extending nom::delimited to use this function:
 # https://github.com/Geal/nom/issues/1253
-parse-hyperlinks = { package = "cairo-take_until_unbalanced", path = "./deps/parse-hyperlinks", version = "0.29.0", default-features = false, features = [
+parse-hyperlinks = { package = "cairo-take_until_unbalanced", path = "./deps/parse-hyperlinks", version = "0.30.0", default-features = false, features = [
     "alloc",
 ] }
-felt = { package = "cairo-felt", path = "./felt", version = "0.6.0", default-features = false, features = [
+felt = { package = "cairo-felt", path = "./felt", version = "0.6.1", default-features = false, features = [
     "alloc",
 ] }
 bitvec = { version = "1", default-features = false, features = ["alloc"] }

diff --git a/RELEASE.md b/RELEASE.md
@@ -19,7 +19,7 @@
     - `felt/Cargo.toml`: update the version string.
     - `deps/parse-hyperlinks/Cargo.toml`: this vendored dependency needs its
       version bumped, but does not need to match the other crate versions.
-  - [Here](https://github.com/lambdaclass/cairo-rs/pull/948/files) is an
+  - [Here](https://github.com/lambdaclass/cairo-rs/pull/1257/files) is an
     example pull request with these changes.
 - [ ] Run `cargo update` and `git add Cargo.lock`
 - [ ] Update `CHANGELOG.md`:

diff --git a/cairo-vm-cli/Cargo.toml b/cairo-vm-cli/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "cairo-vm-cli"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 
 [dependencies]
 bincode = { version = "2.0.0-rc.2", tag = "v2.0.0-rc.2", git = "https://github.com/bincode-org/bincode.git" }
-cairo-vm = { path = "../vm", version = "0.6.0" }
+cairo-vm = { path = "../vm", version = "0.6.1" }
 clap = { version = "3.2.5", features = ["derive"] }
 mimalloc = { version = "0.1.29", default-features = false, optional = true }
 nom = "7"

diff --git a/cairo-vm-cli/src/main.rs b/cairo-vm-cli/src/main.rs
@@ -164,7 +164,13 @@ fn run(args: impl Iterator<Item = String>) -> Result<(), Error> {
 }
 
 fn main() -> Result<(), Error> {
-    run(std::env::args())
+    match run(std::env::args()) {
+        Ok(()) => Ok(()),
+        Err(Error::Cli(_)) => {
+            Ok(()) // Exit with code 0 to avoid printing CLI error message
+        }
+        Err(error) => Err(error),
+    }
 }
 
 #[cfg(test)]
@@ -260,7 +266,7 @@ mod tests {
     //to fool Codecov.
     #[test]
     fn test_main() {
-        assert!(main().is_err());
+        assert!(main().is_ok());
     }
 
     #[test]