Skip to content

Commit

Permalink
Merge branch 'main' into ping-readme-path
Browse files Browse the repository at this point in the history
  • Loading branch information
pefontana authored Jun 23, 2023
2 parents ebc1ee5 + 8c7e1a2 commit bb65cc7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

* 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)
Expand Down
10 changes: 8 additions & 2 deletions cairo-vm-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down Expand Up @@ -260,7 +266,7 @@ mod tests {
//to fool Codecov.
#[test]
fn test_main() {
assert!(main().is_err());
assert!(main().is_ok());
}

#[test]
Expand Down

0 comments on commit bb65cc7

Please sign in to comment.