Merge branch 'main' into simplify-bitops

lambdaclass · Jun 27, 2023 · 6abd177 · 6abd177
2 parents 6da7fe4 + 9ba3c6a
commit 6abd177
Show file tree

Hide file tree

Showing 12 changed files with 158 additions and 295 deletions.
diff --git a/.github/codecov.yml b/.github/codecov.yml
@@ -9,4 +9,3 @@ ignore:
   - vm/src/types/errors
   - hint_accountant
   - vm/src/hint_processor/cairo-1-hint-processor # TODO: Remove this line
-  - ./deps
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,10 +14,6 @@ jobs:
       uses: actions/checkout@v2
     - name: Install stable toolchain
       uses: dtolnay/rust-toolchain@1.69.0
-    - name: Publish crate cairo-take_until_unbalanced
-      env:
-          CRATES_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
-      run: cargo publish --token ${CRATES_TOKEN} --all-features --manifest-path ./deps/parse-hyperlinks/Cargo.toml
     - name: Publish crate cairo-felt
       env:
           CRATES_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,6 @@ members = [
     "felt",
     "vm",
     "hint_accountant",
-    "./deps/parse-hyperlinks",
 ]
 exclude = ["ensure-no_std"]
 
@@ -47,14 +46,6 @@ anyhow = { version = "1.0.69", default-features = false }
 thiserror = { version = "1.0.32", default-features = false }
 thiserror-no-std = { version = "2.0.2", default-features = false }
 
-# This crate has only one function `take_until_unbalanced` that is
-# very useful for our parsing purposes:
-# 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.32.0", default-features = false, features = [
-    "alloc",
-] }
 felt = { package = "cairo-felt", path = "./felt", version = "0.8.0", default-features = false, features = [
     "alloc",
 ] }

diff --git a/RELEASE.md b/RELEASE.md
@@ -17,8 +17,6 @@
     - `cairo-vm-cli/Cargo.toml`: update the version string and also the
       `cairo-vm` dependency version to match the above.
     - `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/1257/files) is an
     example pull request with these changes.
 - [ ] Run `cargo update` and `git add Cargo.lock`
@@ -36,7 +34,6 @@
       versions.
   - [cairo-vm](https://crates.io/crates/cairo-vm)
   - [cairo-felt](https://crates.io/crates/cairo-felt)
-  - [cairo-take-until-unbalanced](https://crates.io/crates/cairo-take_until_unbalanced)
 - [ ] Create a release in Github.
   - Select the recently created tag.
   - Set the title to the version string.

diff --git a/deps/parse-hyperlinks/Cargo.lock b/deps/parse-hyperlinks/Cargo.lock
diff --git a/deps/parse-hyperlinks/Cargo.toml b/deps/parse-hyperlinks/Cargo.toml
diff --git a/deps/parse-hyperlinks/LICENSE b/deps/parse-hyperlinks/LICENSE
diff --git a/deps/parse-hyperlinks/README.md b/deps/parse-hyperlinks/README.md
diff --git a/deps/parse-hyperlinks/src/lib.rs b/deps/parse-hyperlinks/src/lib.rs
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -16,7 +16,6 @@ std = [
     "bincode/std",
     "anyhow/std",
     "starknet-crypto/std",
-    "parse-hyperlinks/std",
     "felt/std",
     "dep:num-prime",
 ]
@@ -59,13 +58,6 @@ thiserror-no-std = { workspace = true }
 
 # only for std
 num-prime = { version = "0.4.3", features = ["big-int"], optional = true }
-
-# This crate has only one function `take_until_unbalanced` that is
-# very useful for our parsing purposes:
-# 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 = { workspace = true }
 felt = { workspace = true }
 bitvec = { workspace = true }